Cleanup tweaks.