dev: Some more fixes for statistics