Fix a couple validation failures