BUG: Couple of bugs and enhancements related to saving and loading keypoints and descriptors