Fix disconnect issues.