Additional std::find fixes