Reconnect fixes