Fixup EAP type definitions