Tweaked notifications to avoid errors for now...