fixes for event handler changes