Sneak in some changes to the copy of single stat modules