Create fodler fixup and i18n additions