Update to work with change in TcpStream api