Fixed notifications issues