Some changes for tcp.