TCP Tweaks

Change-Id: I2d14e9458f5f2eb6a60b8d4aabb000528c45b3d0