Event Fixes :D