Misc minor cleanup