Misc minor tweaks & fixes.