Fix a couple more bugs in new HTTP server code