legacy: import fixes
legacy: import and gettext fixes