Cleanup tweaks