Kinematics fixes