Fix more problems