Few miscellaneous fixes

Created by: derkling

These two comes from a cleanup of the stash on my local machine. They seems to make sense... please @bjackman have a look feel free to rebase-merge if you think there are not bold errors ;-)