Fixing Bugs in Webserver

Fixing some bugs in the Webserver. Writing code without executing it is
buggy sometimes. :-)