Final fixes for pattern rotate