Bug fixes to Notification.sh