minor changes in h2o and integration modules