Made corrections on disconnect events