i18n Wrapping, Minor Fixes