Final few cleanups