AKAZE/KAZE port fixes

Minor fixes