Fixing translation issues