Fix a couple validation errors