Update websocket protocol and other small fixes