Correct a few validation failures