WIP find fixes