Few tiny cleanups