fix some of the definitions for I18N stack usage