Fix overzealous heuristics