Some small cleanups