Fixup event structs for various archs