Fixing event stuff