Fix more config issues