Translation issues fixed