Fixes for recursive find