More fixes to transport