Shores up a few more edge cases that caused dangling connections