A few cleanups