Minor fixes for native search (#79)