Bug fixes for websocket requiring tokens.