fixes for event handler changes
3 files changed