HTTP server fixes