websocket/watch fixes