Some more changes to MaximumFinder