Improvements for connection checking