Just some tiny cleanups