Asorted miscellaneous cleanup