Validation fixes and message updates