Remove more validation errors (#628)