Fixes for i18n support