Some rotation fixes