More bug fixes in addition->quaternion