Bugfixes in correct_kinematics