*8996* Porting stats fixes

See comment above.