Fixed some errors with the import_data modifications