Fixes to work with new use of stats register.