Fix up some validation failures