Noti fix

Fix a number of small issues related to notifications. Fix two caching issues.