Find fixes

Fixes several things identified in the rfind/find() changes.