Some fixes for StatsGraph