Found a few more issues with the HDF5 code.