More fixes: Corrects '_connected' state