i18n and fixes for bundle