Leftover commits from before code migration: Failed ticket fixes

[pegro]

Some commits from the old git not present in this repository. Maybe they are still useful.

[jjeising]

Looks good, not sure why these were lost.