Fixes deprecated finders (2.3)