Fixed/updated the notification methods.