Fixed some bug in the webserver