Minor changes to the H2 importer