diff --git a/.travis.yml b/.travis.yml
index d362fb19e..81f025631 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,23 @@
 sudo: false
 language: node_js
+env:
+  - CXX="g++-4.8"
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    - gcc-4.8
+matrix:
+  allow_failures:
+  - node_js: "4.1.0"
 before_install:
   - npm install -g npm@~1.4.18
+# node_js 4.1.0 is brand new
 node_js:
+  - "4.1.0"
+  - "4.0.0"
   - "0.12"
   - "0.10"
 script:
diff --git a/nodes/core/core/89-trigger.js b/nodes/core/core/89-trigger.js
index fa6daa155..df4bce5e5 100644
--- a/nodes/core/core/89-trigger.js
+++ b/nodes/core/core/89-trigger.js
@@ -64,7 +64,7 @@ module.exports = function(RED) {
                     else if (node.op1Templated) { msg.payload = mustache.render(node.op1,msg); }
                     else { msg.payload = node.op1; }
                     if (node.op1type !== "nul") { node.send(msg); }
-                    if (node.duration === 0) { tout = "infinite"; }
+                    if (node.duration === 0) { tout = 0; }
                     else {
                         tout = setTimeout(function() {
                             msg.payload = m2;
diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js
index ae1bff84d..c15735827 100644
--- a/test/nodes/core/storage/50-file_spec.js
+++ b/test/nodes/core/storage/50-file_spec.js
@@ -457,7 +457,7 @@ describe('file Nodes', function() {
                     logEvents.should.have.length(1);
                     logEvents[0][0].should.have.a.property('msg');
                     //logEvents[0][0].msg.toString().should.equal("Error: ENOENT, open 'badfile'");
-                    logEvents[0][0].msg.toString().should.startWith("Error: ENOENT, open");
+                    logEvents[0][0].msg.toString().should.startWith("Error: ENOENT");
                     done();
                 },wait);
                 n1.receive({payload:""});