Fix notifications & clean notifications