Minor missed cleanups