notifications issues fixed