Notification Fixes