More tiny cleanups