Some minor cleanups.