Tweak to conn handling.