Bug fixes with the settings.