Client side i18n support minor fixes