Misc minor mods