Bug fixes for settings 2.15.1