LAPIC improvements