Finder plugin fixes round 1