*8015* Statistics integration fixes