More rotation fixes.