MORE fixes to settings.