Fixes in kp stuff