Make sure events are tracked