adjust to transport refactorings