Fix translation bugs. Closes #897. Closes #898.