[PATCH 0/4] Misc cleanups