Fixes to server statistics not being registered properly