US536 - Fix language issues