Fixes from pair programming session
Merge branch 'ux-client' of https://github.com/ymirpl/h2o into ux-client