Fixing deprecated finders