Couple of fixes to Quaternion