Fix Notification Stuff