Bug fixes from test of web server refactor