Some more places where .locate was needed.
(Can we just override the general find method or similar to do this automatically everywhere?)