Notifications issues fixed