Fixing validation highlighting