Tweaks to help debug whether there's a connection leak.