Various fixes for settings.