Fixing some issues in translation