Fixed issues with the translator