HttpServer improvements