Event Notifications Fixes