Translation fixes, closes #1392