Some various cleanups.