Some other cleanups I forgot