Notification Reminder Fixes