Translation bug fixes