Fix race condition and cleanup transport ref#9

GodPuffin wants to merge 2 commits intolettaGodPuffin/argus:lettafrom

cursor/fix-race-condition-and-cleanup-transport-ref-4833GodPuffin/argus:cursor/fix-race-condition-and-cleanup-transport-ref-4833Copy head branch name to clipboard