fixes to h2