Fixed more rotation bugs