Translator fixes for testing