few more events.js fixes