Fixed some methods in Event