Websocket support fixes