Misc minor tweaks