Changes to websocket support