Tweaked disconnect methods