Miscellaneous cleanups