Apply PR #20 to GTT and fix some of translations