h2 fixes