Small validator changes
message