A few changes arround connect/disconnect