Fixes to connection status