General fixes on using notifications