Fixes/improvements to the new unified transport