Fixes for SharpMotionState