ConnectCtrl improvments