Fixes to h2 performance