Fixed minor connection/disconnection bugs