Fixed statistics issues