A few fixes. Websocket stuff getting closer to being plumbed.