Some minor cleanups