Fixed translation issues