Fix notifications's issues