More fixes for the settings -- Commit 41