Various fixes to WebServer API