DiskDataManager fixes