* Additional i18n code corrections and enhancements