Fixed header problems in export/import - again (sigh)