Misc minor fixes