Miscellaneous minor tweaks