diff --git a/actions/changes.js b/actions/changes.js
index 0fa5597..85e0890 100644
--- a/actions/changes.js
+++ b/actions/changes.js
@@ -18,7 +18,7 @@
     var host = msg.host;
     var protocol = msg.protocol || 'https';
     var port = msg.port;
-    var maxTriggers = msg.maxTriggers;
+    var maxTriggers = msg.maxTriggers || -1;
 
     var validProperties = {
         authKey: "",
diff --git a/provider/lib/utils.js b/provider/lib/utils.js
index db82187..2cdc238 100644
--- a/provider/lib/utils.js
+++ b/provider/lib/utils.js
@@ -182,11 +182,6 @@
             logger.warn(tid, method, 'cloudant trigger feed: includeDoc parameter is no longer supported and will be ignored.');
         }
 
-        var includeDoc;
-        if (obj.includeDoc) {
-            includeDoc = ((obj.includeDoc === true || obj.includeDoc.toString().trim().toLowerCase() === 'true')) || 'false';
-        }
-        
         var trigger = {
             id: id,
             accounturl: obj.accounturl,
@@ -196,7 +191,7 @@
             host: obj.host,
             port: obj.port,
             protocol: obj.protocol,
-            includeDoc: includeDoc,
+            includeDoc: obj.includeDoc,
             apikey: obj.apikey,
             since: obj.since,
             callback: obj.callback,