notifications fixes