Merge pull request #611 from h2o/kazuho/issue605

fix 3 remaining issues reported in #605