Fix bugs on H2O 2