Final tweaks to Statistics