Fix more debug stuff