a few more tweaks to get T0 for transport in place