Fix bugs for disrupted communication