websocket client fixes