Minor bug fixes
Merge branch 'master' of https://github.com/0xdata/h2o