events: small fixes