Improve fail highlighting