Fixes for changes in HDF5 layout