Assorted cleanups