Minor changes in registerForNotifications