Third round of validation error clean up