More tweaks to auto translate