Validation quick fixes