Httpserver migration fixes