Minor Fixes and i18n enhancements