Misc updates for TCPSocket based on Streams API