#3880 h2 fixes