DataImporter and MemLeak fixes

DataImporter and MemLeak fixes