Translation fixes. Closes #271