Reconnection fixes