Cleanup of corner-cases in SettingsTab