Fixed a few Event Bugs