Adding keypoint fixes