refactor: handle transport locks a bit better