Miscellaneous fixes and improvements

[a3f]

I tried setting this up and these patches resulted along the way. See individual commit messages for more information.

[ejoerns]

I've applied some minor fixes and squashed the last commit.