fixes for websockets