Bug fixesin notification handling