Fixes to importer and hoc hack