More miscellaneous cleanup