Fix a few validation errors.