* WebSocket WIP: Small changes