Fix events registration in the toolkit
Fix demo