More fixes on checking connection requests / existing connections