Rotation system fixes