Fixes and improvements in find path
Fix #249