Transport fixes