Make event handlers fire properly

Respond to review comments

LMS-1242