Use correct notificationID
Small fixes