Fixed notifications problems