Fixed some i18n issues after review.