Fix validation errors
Improve wording