Fixed notification warnings