Fix issue #150: I18n clean-ups