Fix more of the Settings