[DE1128] Fixes for HDF5 file generation