More event.js fixes