Shuffle a few flags around, make NumaNode more resilient