Fix some validation errors, more remain.