Yet more fixes on translations