Fix bugs in guardian importer