Fix more stuff