minor fixes and changes
cherry-pick resolution for event hook fixes