Some initial fixes in WebServer