*8996* Porting stats fixes

Nice one, I will steal that.