Misc cleanups