fixes for dumpAllSamples