Fix up Event Spec