Some improvements to stats/messages