Fixed some methods in Event and EventMaker