Potential Notification Fixes