Small fixes
+Websocket Proxy code