more fixes to websockets