Corrected returns for connect, and disconnect