Fixed a few leftover issues from cleaning up the Event class