Fix translation problems, take 2.