Fix up NUMA-Q build with new generic apic mode stuff