Better TCP handling