Fix events

Fixes events handling at join and import.