diff --git a/pupy/pupylib/PupyModule.py b/pupy/pupylib/PupyModule.py
index 86ea720b..b01dc82e 100644
--- a/pupy/pupylib/PupyModule.py
+++ b/pupy/pupylib/PupyModule.py
@@ -448,7 +448,7 @@ class PupyModule(object):
         if not self.client.pupsrv.start_webserver():
             return None
         else:
-            return self.client.pupsrv.pupweb.start_webplugin(self.web_handlers)
+            return self.client.pupsrv.pupweb.start_webplugin('rdesktop', self.web_handlers)
 
     @classmethod
     def is_compatible_with(cls, client):
diff --git a/pupy/pupylib/PupyWeb.py b/pupy/pupylib/PupyWeb.py
index f6b263df..4af3103b 100644
--- a/pupy/pupylib/PupyWeb.py
+++ b/pupy/pupylib/PupyWeb.py
@@ -56,7 +56,7 @@ class RequestHandler(TornadoRequestHandler):
             self.finish(log_msg)
             return
 
-        super(WebSocketHandler, self).prepare(*args, **kwargs)
+        super(RequestHandler, self).prepare(*args, **kwargs)
 
 class StaticTextHandler(TornadoRequestHandler):
     def set_default_headers(self):
@@ -214,7 +214,7 @@ class PupyWebServer(object):
         self._ioloop = None
         self._thread = None
 
-        for _, _, cleanup in self._registered:
+        for (_, _, cleanup) in self._registered.itervalues():
             if cleanup:
                 cleanup()