diff --git a/canned/influxdb_database.json b/canned/influxdb_database.json
index 1d632fd816..96255e94ab 100644
--- a/canned/influxdb_database.json
+++ b/canned/influxdb_database.json
@@ -22,7 +22,7 @@
         {
           "query": "SELECT max(\"numSeries\") AS \"series\" FROM \"influxdb_database\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
diff --git a/canned/influxdb_httpd.json b/canned/influxdb_httpd.json
index 4fb19ecb77..e5d434256e 100644
--- a/canned/influxdb_httpd.json
+++ b/canned/influxdb_httpd.json
@@ -14,7 +14,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"writeReq\"), 1s) AS \"http_requests\" FROM \"influxdb_httpd\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
@@ -32,7 +32,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"queryReq\"), 1s) AS \"query_requests\" FROM \"influxdb_httpd\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
@@ -50,7 +50,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"clientError\"), 1s) AS \"client_errors\" FROM \"influxdb_httpd\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
@@ -58,7 +58,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"authFail\"), 1s) AS \"auth_fail\" FROM \"influxdb_httpd\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
diff --git a/canned/influxdb_queryExecutor.json b/canned/influxdb_queryExecutor.json
index cfbf2c1c1a..fef1d8f902 100644
--- a/canned/influxdb_queryExecutor.json
+++ b/canned/influxdb_queryExecutor.json
@@ -14,7 +14,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"queryDurationNs\"), 1s) AS \"duration\" FROM \"influxdb_queryExecutor\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
@@ -22,7 +22,7 @@
         {
           "query": "SELECT non_negative_derivative(max(\"queriesExecuted\"), 1s) AS \"queries_executed\" FROM \"influxdb_queryExecutor\"",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
           ],
           "wheres": []
diff --git a/canned/netstat.json b/canned/netstat.json
index 2d7092b5f2..e77b4367ca 100644
--- a/canned/netstat.json
+++ b/canned/netstat.json
@@ -36,14 +36,14 @@
       "name": "System - Sockets Created/Second ",
       "queries": [
         {
-          "query": "SELECT derivative(\"tcp_established\") AS \"tcp_established\" FROM netstat",
+          "query": "SELECT non_negative_derivative(max(\"tcp_established\")) AS \"tcp_established\" FROM netstat",
           "db": "telegraf",
           "rp": "",
           "groupbys": [],
           "wheres": []
         },
         {
-          "query": "SELECT derivative(\"udp_socket\") AS \"udp_socket\" FROM netstat",
+          "query": "SELECT non_negative_derivative(max(\"udp_socket\")) AS \"udp_socket\" FROM netstat",
           "db": "telegraf",
           "rp": "",
           "groupbys": [],
diff --git a/canned/new_apps.sh b/canned/new_apps.sh
index 6ccdd02dd0..34c463b75c 100755
--- a/canned/new_apps.sh
+++ b/canned/new_apps.sh
@@ -51,7 +51,7 @@ cat > $APP_FILE << EOF
  		"queries": [{
  			"query": "select used_percent from disk",
  			"db": "telegraf",
- 			"rp": "autogen",
+ 			"rp": "",
   			"groupbys": [],
   			"wheres": []
 		}]
diff --git a/canned/nsq_topic.json b/canned/nsq_topic.json
index 66c45828ea..860d9d858c 100644
--- a/canned/nsq_topic.json
+++ b/canned/nsq_topic.json
@@ -50,7 +50,7 @@
       "name": "NSQ - Topic Ingress",
       "queries": [
         {
-          "query": "select derivative(\"message_count\") AS \"messages_per_second\" FROM nsq_topic",
+          "query": "select non_negative_derivative(max(\"message_count\")) AS \"messages_per_second\" FROM nsq_topic",
           "db": "telegraf",
           "rp": "",
           "groupbys": [
@@ -70,9 +70,9 @@
       "name": "NSQ topic egress",
       "queries": [
         {
-          "query": "select derivative(\"message_count\") - derivative(\"depth\") as messages_per_second from nsq_topic",
+          "query": "SELECT non_negative_derivative(max(\"message_count\")) - non_negative_derivative(max(\"depth\")) AS \"messages_per_second\" FROM nsq_topic",
           "db": "telegraf",
-          "rp": "autogen",
+          "rp": "",
           "groupbys": [
             "\"topic\"",
             "\"host\""
diff --git a/canned/redis.json b/canned/redis.json
index 6edc5a8cf0..e58cc3bbd2 100644
--- a/canned/redis.json
+++ b/canned/redis.json
@@ -44,7 +44,7 @@
       "name": "Redis - CPU",
       "queries": [
         {
-          "query": "SELECT non_negative_derivative(\"used_cpu_user\") AS \"used_cpu_per_second\" FROM redis",
+          "query": "SELECT non_negative_derivative(max(\"used_cpu_user\")) AS \"used_cpu_per_second\" FROM redis",
           "db": "telegraf",
           "rp": "",
           "groupbys": []
@@ -60,7 +60,7 @@
       "name": "Redis - Memory",
       "queries": [
         {
-          "query": "SELECT non_negative_derivative(\"used_memory\") AS \"used_memory_per_second\" FROM redis",
+          "query": "SELECT non_negative_derivative(max(\"used_memory\")) AS \"used_memory_per_second\" FROM redis",
           "db": "telegraf",
           "rp": "",
           "groupbys": []