Misc minor tweaks / fixes