Some fixes in the settings.