Minor fixes to rotate