Update h2 to latest version
Fix some quality flaws