More fixes for H5