fix some find bugs.
Merge branch 'dev'