A few small cleanups