Settings: Fix more build errors