Fix#871

Translation-relative fixes.