some quick fixes based on qa
Merge branch 'stats-rep' into stats-stage