Fix ContestImporter and Importer