Fixed minor adjustment with h2's
Commiting merge from remote