Fix 'evt is undefined' errors