Fixes to notifier for untyped subscribers