Some updates after recent h2h test