HDF5 topology fixes