Various small cleanups