Bug Fixes in Notification System