diff --git a/src/graphs.js b/src/graphs.js
index 98c6b256d..10086c970 100644
--- a/src/graphs.js
+++ b/src/graphs.js
@@ -81,7 +81,7 @@ async function getSystem(fromMinutes, noNullPoints) {
     const timeBucketSize = fromMinutes > (24 * 60) ? (6*60) : 5;
     const graphiteUrl = await getGraphiteUrl();
 
-    const cpuQuery = `summarize(sum(collectd.localhost.aggregation-cpu-average.cpu-system, collectd.localhost.aggregation-cpu-average.cpu-user), "${timeBucketSize}min", "avg")`;
+    const cpuQuery = `summarize(sum(collectd.localhost.aggregation-cpu-sum.cpu-system, collectd.localhost.aggregation-cpu-sum.cpu-user), "${timeBucketSize}min", "avg")`;
     const memoryQuery = `summarize(collectd.localhost.memory.memory-used, "${timeBucketSize}min", "avg")`;
 
     const query = {
diff --git a/src/nginxconfig.ejs b/src/nginxconfig.ejs
index a8b04ac0f..50977bd2f 100644
--- a/src/nginxconfig.ejs
+++ b/src/nginxconfig.ejs
@@ -247,7 +247,7 @@ server {
         client_max_body_size 0;
     }
 
-    # graphite paths (uncomment block below and visit /graphite-web/dashboard)
+    # graphite paths (uncomment block below and visit /graphite-web/)
     # remember to comment out the CSP policy as well to access the graphite dashboard
     # location ~ ^/graphite-web/ {
     #     proxy_pass http://172.18.0.6:8000;