*8996* Porting stats fixes