Fixes and fixes for fixes

Commits explained in themselves.

Are you happy now, @mcmonkey4eva?