[core] Fix type issues with emitted events (#4932)

[core] Fix type issues with emitted events (#4932) #744