Bad Notifications and Non-notifications

@Merk,