Fix#871

Translation-relative fixes.

Closes #871 and #887.