Still fixing analytics