Fix supporting typed notifications