Fixed up some bugs in the new Usock implementation