Small tweaks to event tracking