Updates to event-old.h