Some websocket fixes