Collection of minor fixes and tweaks

Please merge using ```git --no-ff``` to save commit history