Notification registration fixes

minor fixes to notification registration