Fix more mistakes