Fixes to importer and parser