fixes for h2d