Further fixes to H2 margin problem