Fix EventHandler not being created; add some missing triggesr.