Fixing translation problems