More disconnect state fixes