Fixed all notifications issues