Websocket connectivity improvements