Transport layer fixes
Transport layer changes