More fixes for bad matching.