Move I18n fix earlier in the boot process