First round of validation error clean-up