Tweak the module/i18n handling