Minor refactors
Recover holes in HDFRecordReader