Fix more rotation issues