Fix validation and related translations