Fix more config stuff