Correct some validation