Fix more settings bugs