Mixpanel fixes