WebSocket, JavaScript fixes, etc.