Minor cleanups #2