Fixing some translation issues