Improve class finder

More fallback cases, e.g. try root scope.