Tweaked connect/disconnect commands