H2 fixes