Improvements to raptor-i18n