Fixes after Quaternion r65