more fixes
Merge pull request #2336 from ether/more-socket-io-fixes

more fixes