Minor mods to translator