Connection down fixes