Stengthen the heuristics a bit (aka don't misclassify some of