more find fixes