Fixed two issues with converting notifications.