Small connection checking and creation tweaks