diff --git a/README.md b/README.md
index cf06eec2..f54b968f 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,9 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.4.25
+-  Fix to Language Translation Node to allow it work with File Inject
+
 ### New in version 0.4.24
 - Bugfixes to Language Translator Train Node
 
diff --git a/package.json b/package.json
index ee9d79dd..76432d9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",
diff --git a/services/language_translation/v2.html b/services/language_translation/v2.html
index 8664c509..59ecae82 100644
--- a/services/language_translation/v2.html
+++ b/services/language_translation/v2.html
@@ -133,7 +133,7 @@
       has been switched off this node will no longer work. The node will be removed from the palette in a
       future release. </p>
     <br/>
-    <p>Packaged in with release 0.4.21 of node-red-node-watson</p>
+    <p>Packaged in with release 0.4.25 of node-red-node-watson</p>
     <p>The Language Translation service enables you to translate text from one language to another and to add your own translation models.</p>
     <p></p>
     <p><b>Translation Mode</b>.</p>
@@ -180,27 +180,33 @@
 </script>
 
 <script type="text/javascript">
-  var models = null;
-  var domains = null;
-  var basemodels = null;
-  var custommodels = null;
-  var domain_type;
-  var first_launch = true;
-  var have_credentials = false;
-  var using_local_credentials = false;
-  var using_local_parameters2 = false;
-  var using_gloabal_parameters2 = false;
-
-  var action = $('#node-input-action').val();
-  var domain_selected = $('#node-input-domainhidden').val();
-  var custom_selected = $('#node-input-customhidden').val();
-  var srclang_selected = $('#node-input-srclanghidden').val();
-  var destlang_selected = $('#node-input-destlanghidden').val();
-  var base_model_selected = $('#node-input-basemodelhidden').val();
-  var lg_parameters_selected2 = $('#node-input-ldparamshidden2').val();
-
-
-  var LANGUAGES = { 'ar' : 'Arabic',
+  // Need to simulate a namespace, so that some of the variables don't leak across nodes
+  function Translation () {
+  }
+
+  // This is the namespace for tts.
+  var txn = new Translation();
+
+  txn.models = null;
+  txn.domains = null;
+  txn.basemodels = null;
+  txn.custommodels = null;
+  txn.domain_type;
+  txn.have_credentials = false;
+  txn.using_local_credentials = false;
+  txn.using_local_parameters2 = false;
+  txn.using_global_parameters2 = false;
+
+  txn.action = $('#node-input-action').val();
+  txn.domain_selected = $('#node-input-domainhidden').val();
+  txn.custom_selected = $('#node-input-customhidden').val();
+  txn.srclang_selected = $('#node-input-srclanghidden').val();
+  txn.destlang_selected = $('#node-input-destlanghidden').val();
+  txn.base_model_selected = $('#node-input-basemodelhidden').val();
+  txn.lg_parameters_selected2 = $('#node-input-ldparamshidden2').val();
+
+
+  txn.LANGUAGES = { 'ar' : 'Arabic',
                     'arz': 'Spoken Arabic',
                     'en': 'English' ,
                     'es': 'Spanish',
@@ -213,13 +219,13 @@
                   };
 
   // convert an id in the form it-ko into Italian - Korean for display
-  function changeIdToText(id) {
+  txn.changeIdToText = function (id) {
     var txt = "";
     var langs = id.split('-');
     var first = true;
 
     langs.forEach(function(language){
-      txt += (LANGUAGES[language] ? LANGUAGES[language] : language);
+      txt += (txn.LANGUAGES[language] ? txn.LANGUAGES[language] : language);
       if (first) {
         txt += ' - ';
         first = false;
@@ -230,9 +236,9 @@
 
   // Function to be used at the start, as don't want to expose any fields, unless the model is
   // available. The model it self can only be fetched if the credentials are available.
-  function hideAll() {
+  txn.hideAll = function () {
     $('#id-error-getting-models').hide();
-    if (!models) {
+    if (!txn.models) {
         $('#credentials-not-found').show();
         $('#node-input-action').parent().hide();
         $('select#node-input-srclang, select#node-input-destlang').parent().hide();
@@ -253,31 +259,31 @@
   // the model has been retrieved then this function is invoked to update what fields
   // are shown without the user having to close the dialog.
   // Problem is that the onchange is only invoked when the user tabs to another field.
-  function checkVisibility() {
-    if (models) {
+  txn.checkVisibility = function () {
+    if (txn.models) {
       $('#node-input-action').parent().show();
-      checkActionSelected();
+      txn.checkActionSelected();
     }
   }
 
   // sorting functions
-  function checkUnique(value, index, self) {
+  txn.checkUnique = function (value, index, self) {
     return self.indexOf(value) === index;
   }
 
 
   // Retrieve the available models from the server, if data is returned, then
   // can enable the dynamic selection fields.
-  function checkModels() {
+  txn.checkModels = function () {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
 
     $.getJSON('watson-translate/models/', {un: u, pwd: p}).done(function (data) {
       if (data.models) {
         $('#id-error-getting-models').hide();
-        models = data.models;
-        have_credentials = true;
-        checkVisibility();
+        txn.models = data.models;
+        txn.have_credentials = true;
+        txn.checkVisibility();
       } else if (data.error){
         $('#id-error-getting-models').show();
         $('#id-error-getting-models').text(data.error);
@@ -289,16 +295,16 @@
 
   // Simple check that is only invoked if the service is not bound into bluemix. In this case the
   // user has to provide credentials. Once there are credentials, then the models are retrieved.
-  function getCredentials() {
+  txn.getCredentials = function () {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
 
     if (u && u.length && p) {
-      if (!models) {
-        checkModels();
-        if (models) {$('#node-input-action').parent().show(); }
+      if (!txn.models) {
+        txn.checkModels();
+        if (txn.models) {$('#node-input-action').parent().show(); }
       }
-    } else if (!models) {
+    } else if (!txn.models) {
       $('#node-input-action').parent().hide();
     }
   }
@@ -306,24 +312,24 @@
   // function that is called when the domain or the source language is changed. In this case the
   // destination language selection field is dynamically repopulated, and reselected if the
   // previously selection is still in the new list.
-  function langDestAvailable() {
-    if (!domain_type) { return; }
+  txn.langDestAvailable = function() {
+    if (!txn.domain_type) { return; }
 
-    var pair_lang = domain_type.map(function (a) {
+    var pair_lang = txn.domain_type.map(function (a) {
       return a.model_id;
     });
 
     // need to do an exact source language match to allow for variations
     // like ar and arz. if the input is ar, then don't want it to match with arz
     var available_destlang = pair_lang.filter(function (model_id) {
-      return model_id.match('^' + srclang_selected + '-');
+      return model_id.match('^' + txn.srclang_selected + '-');
     });
 
     available_destlang.forEach(function (val) {
       var lang = val.split('-')[1];
 
       var selectedText = '';
-      if (destlang_selected === lang) {
+      if (txn.destlang_selected === lang) {
         selectedText = 'selected="selected"';
       }
       $('select#node-input-destlang')
@@ -331,27 +337,27 @@
                       + '"' + lang + '"'
                       + selectedText
                       + '>'
-                      + (LANGUAGES[lang] ? LANGUAGES[lang] : lang)
+                      + (txn.LANGUAGES[lang] ? txn.LANGUAGES[lang] : lang)
                       + '</option>');
     });
-    destlang_selected = $('#node-input-destlang').val();
+    txn.destlang_selected = $('#node-input-destlang').val();
   }
 
   // Populates the domains selection field.
   // If domains have already been retrieved then no need to refetch them.
-  function checkDomains() {
-    if (!domains) {
-      domains = models.map(function (a) {
+  txn.checkDomains = function () {
+    if (!txn.domains) {
+      txn.domains = txn.models.map(function (a) {
         return a.domain;
       });
     }
-    if (domains && domains.length) {
+    if (txn.domains && txn.domains.length) {
       $('select#node-input-domain').empty();
-      var unique_domains = domains.filter(checkUnique);
+      var unique_domains = txn.domains.filter(txn.checkUnique);
 
       unique_domains.forEach(function(domain) {
         var selectedText = '';
-        if (domain_selected === domain) {
+        if (txn.domain_selected === domain) {
           selectedText = 'selected="selected"';
         }
         $('select#node-input-domain')
@@ -364,22 +370,22 @@
                         + '</option>');
       });
 
-    checkDomainSelected();
+    txn.checkDomainSelected();
     }
   }
 
   // Populates the base model field. These are the models that are available to be customised.
-  function checkBaseModels() {
-    if (!basemodels && models) {
-      basemodels = models.filter(function (model) {
+  txn.checkBaseModels = function () {
+    if (!txn.basemodels && txn.models) {
+      txn.basemodels = txn.models.filter(function (model) {
         return model.customizable === true;
       });
     }
-    if (basemodels) {
+    if (txn.basemodels) {
       $('select#node-input-basemodel').empty();
-      basemodels.forEach(function(base_model){
+      txn.basemodels.forEach(function(base_model){
         var selectedText = '';
-        if (base_model_selected === base_model.model_id) {
+        if (txn.base_model_selected === base_model.model_id) {
             selectedText = 'selected="selected"';
         }
         $('select#node-input-basemodel')
@@ -387,7 +393,7 @@
                           + '"' + base_model.model_id + '"'
                           + selectedText
                           + '>'
-                          + changeIdToText(base_model.model_id)
+                          + txn.changeIdToText(base_model.model_id)
                           + '</option>');
       });
     }
@@ -398,18 +404,18 @@
   // will happen is by a page refresh. Need to have a trigger everytime the create
   // new model is triggerd, but that is a little complicated and needs to be done on
   // a clear mind.
-  function checkCustomsAvailable() {
-    if (!custommodels && models) {
-      custommodels = models.filter(function (m) {
+  txn.checkCustomsAvailable = function() {
+    if (!txn.custommodels && txn.models) {
+      txn.custommodels = txn.models.filter(function (m) {
         return (m.base_model_id && ('' != m.base_model_id));
       });
     }
-    if (custommodels) {
+    if (txn.custommodels) {
       $('select#node-input-custom').empty();
 
-      custommodels.forEach(function(m){
+      txn.custommodels.forEach(function(m){
         var selectedText = '';
-        if (custom_selected === m.model_id) {
+        if (txn.custom_selected === m.model_id) {
             selectedText = 'selected="selected"';
         }
         $('select#node-input-custom')
@@ -428,11 +434,11 @@
 
   // UI Handler for the Mode / switch.
   // Princliple function is to show / hide the appropriate fields.
-  function checkActionSelected() {
-    action = $('#node-input-action').val();
-    if (models) {
+  txn.checkActionSelected = function () {
+    txn.action = $('#node-input-action').val();
+    if (txn.models) {
       $('#credentials-not-found').hide();
-      switch (action) {
+      switch (txn.action) {
         case 'translate':
           $('select#node-input-srclang, select#node-input-destlang').parent().show();
           $('select#node-input-domain').parent().show();
@@ -471,54 +477,51 @@
           $('#languagetranslation-form-tips').show();
           break;
       }
-      checkDomains();
-      checkBaseModels();
-      checkCustomsAvailable();
+      txn.checkDomains();
+      txn.checkBaseModels();
+      txn.checkCustomsAvailable();
     } else {
       $('#credentials-not-found').show();
     }
   }
 
+  // Function does not appear to be used, comment out until someone complains.
   // UI Handler for the Parameter scope switch: Local or Global
-  function checkParamScopeSelected(){
-
-
+  //txn.checkParamScopeSelected = function (){
     // Checkbox control
-    lg_parameters_selected2 = $('input#node-input-lgparams2').prop('checked');
-    if (checked) {
-      using_gloabal_parameters2 = true;
-      using_local_parameters2 = false;
-    } else {
-      using_gloabal_parameters2 = false;
-      using_local_parameters2 = true;
-    }
-
-
-  }
+  //  txn.lg_parameters_selected2 = $('input#node-input-lgparams2').prop('checked');
+  //  if (checked) {
+  //    txn.using_global_parameters2 = true;
+  //    txn.using_local_parameters2 = false;
+  //  } else {
+  //    txn.using_global_parameters2 = false;
+  //    txn.using_local_parameters2 = true;
+  //  }
+  //}
 
 
   // UI Handler for the domain switch
   // Repopulate the source and languages based on the available translations for the domain
-  function checkDomainSelected(){
+  txn.checkDomainSelected = function(){
     $('#node-input-srclang').empty();
     $('#node-input-destlang').empty();
-    if (models && domains) {
-      domain_selected = $('#node-input-domain').val();
-      domain_type = models.filter(function (model) {
-        return model.domain === domain_selected && model.status === 'available';
+    if (txn.models && txn.domains) {
+      txn.domain_selected = $('#node-input-domain').val();
+      txn.domain_type = txn.models.filter(function (model) {
+        return model.domain === txn.domain_selected && model.status === 'available';
       });
-      var input_lang = domain_type.map(function (a) {
+      var input_lang = txn.domain_type.map(function (a) {
         return a.source;
       });
-      var output_lang = domain_type.map(function (a) {
+      var output_lang = txn.domain_type.map(function (a) {
         return a.target;
       });
-      input_lang_unique = input_lang.filter(checkUnique);
-      output_lang_unique = output_lang.filter(checkUnique);
+      input_lang_unique = input_lang.filter(txn.checkUnique);
+      output_lang_unique = output_lang.filter(txn.checkUnique);
 
       input_lang_unique.forEach(function(lang){
         var selectedText = '';
-        if (srclang_selected === lang) {
+        if (txn.srclang_selected === lang) {
           selectedText = 'selected="selected"';
         }
         $('select#node-input-srclang')
@@ -526,56 +529,56 @@
                         + '"' + lang + '"'
                         + selectedText
                         + '>'
-                        + (LANGUAGES[lang] ? LANGUAGES[lang] : lang)
+                        + (txn.LANGUAGES[lang] ? txn.LANGUAGES[lang] : lang)
                         + '</option>');
       });
       // Having repopulated the input language selection, the old selected item
       // may no longer be in the list, so refresh it.
-      srclang_selected = $('#node-input-srclang').val();
-      langDestAvailable();
+      txn.srclang_selected = $('#node-input-srclang').val();
+      txn.langDestAvailable();
     }
   }
 
 
   // Register the handlers for the fields
-  function UIListeners() {
+  txn.UIListeners = function () {
     $('#node-input-username').change(function(val){
-      getCredentials();
-      if (have_credentials) {
-        checkActionSelected();}
+      txn.getCredentials();
+      if (txn.have_credentials) {
+        txn.checkActionSelected();}
     });
     $('#node-input-password').change(function(val){
-      getCredentials();
-      if (have_credentials) {
-        checkActionSelected();
+      txn.getCredentials();
+      if (txn.have_credentials) {
+        txn.checkActionSelected();
       }
     });
 
     $('#node-input-action').change(function(val){
-      action = $('#node-input-action').val();
-      checkActionSelected();
+      txn.action = $('#node-input-action').val();
+      txn.checkActionSelected();
     });
 
     $('#node-input-domain').change(function (val) {
-      domain_selected = $('#node-input-domain').val();
-      checkDomainSelected();
+      txn.domain_selected = $('#node-input-domain').val();
+      txn.checkDomainSelected();
     });
 
     $('#node-input-custom').change(function () {
-      custom_selected = $('#node-input-custom').val();
+      txn.custom_selected = $('#node-input-custom').val();
     });
 
     $('#node-input-srclang').change(function () {
-      srclang_selected = $('#node-input-srclang').val();
-      langDestAvailable();
+      txn.srclang_selected = $('#node-input-srclang').val();
+      txn.langDestAvailable();
     });
 
     $('#node-input-destlang').change(function () {
-      destlang_selected = $('#node-input-destlang').val();
+      txn.destlang_selected = $('#node-input-destlang').val();
     });
 
     $('#node-input-basemodel').change(function (val) {
-      base_model_selected = $('#node-input-basemodel').val();
+      txn.base_model_selected = $('#node-input-basemodel').val();
     });
 
     $('#node-input-lgparams2').change(function (val) {
@@ -589,47 +592,47 @@
   // restart, the settings for the dynamic fields are lost.
   // So hidden (text) fields are being used to squirrel away the values, so that
   // they can be restored.
-  function restoreHidden() {
-    domain_selected = $('#node-input-domainhidden').val();
-    $('select#node-input-domain').val(domain_selected);
-    srclang_selected = $('#node-input-srclanghidden').val();
-    $('select#node-input-srslang').val(srclang_selected);
-    destlang_selected = $('#node-input-destlanghidden').val();
-    $('select#node-input-destlang').val(destlang_selected);
+  txn.restoreHidden = function () {
+    txn.domain_selected = $('#node-input-domainhidden').val();
+    $('select#node-input-domain').val(txn.domain_selected);
+    txn.srclang_selected = $('#node-input-srclanghidden').val();
+    $('select#node-input-srslang').val(txn.srclang_selected);
+    txn.destlang_selected = $('#node-input-destlanghidden').val();
+    $('select#node-input-destlang').val(txn.destlang_selected);
 
-    base_model_selected = $('#node-input-basemodelhidden').val();
-    $('select#node-input-basemodel').val(base_model_selected);
-    custom_selected = $('#node-input-customhidden').val();
-    $('select#node-input-custom').val(custom_selected);
+    txn.base_model_selected = $('#node-input-basemodelhidden').val();
+    $('select#node-input-basemodel').val(txn.base_model_selected);
+    txn.custom_selected = $('#node-input-customhidden').val();
+    $('select#node-input-custom').val(txn.custom_selected);
 
 
-    lg_parameters_selected2 = $('input#node-input-lgparams2').prop('checked');
+    txn.lg_parameters_selected2 = $('input#node-input-lgparams2').prop('checked');
 
   }
 
   // This is the on edit prepare function, which will be invoked everytime the dialog is shown.
   function oneditprepare() {
-    hideAll();
-    restoreHidden();
+    txn.hideAll();
+    txn.restoreHidden();
 
-    UIListeners();
+    txn.UIListeners();
     // Look for VCAP Json file, done is called if found or not, with service indicating
     // if the translation service is actually bound into this application.
-    if (!have_credentials) {
+    if (!txn.have_credentials) {
       $.getJSON('watson-translate/vcap/')
         .done(function (service) {
           // for some reason the getJSON resets the vars so need to restoreHidden again
           // so again.
-          restoreHidden();
+          txn.restoreHidden();
           $('.credentials').toggle(!service);
           if (!service) {
             // no bound service, so check local settings to see if they are valid
-            using_local_credentials = true;
-            getCredentials();
+            txn.using_local_credentials = true;
+            txn.getCredentials();
           } else {
             // credentials are only valid if we can get hold of the models using them
-            using_local_credentials = false;
-            if (!models) {checkModels();}
+            txn.using_local_credentials = false;
+            if (!txn.models) {txn.checkModels();}
           }
         }).fail(function () {
           $('.credentials').show();
@@ -638,27 +641,27 @@
         });
     }
     // credentials can be set during the oneditprepare process, so check again.
-    if (have_credentials || using_local_credentials)
+    if (txn.have_credentials || txn.using_local_credentials)
     {
       $('#credentials-check').hide();
-      if (have_credentials) {
+      if (txn.have_credentials) {
         $('#credentials-not-found').hide();
       }
-      if (using_local_credentials) {
+      if (txn.using_local_credentials) {
         $('.credentials').show();
       }
-      checkActionSelected();
+      txn.checkActionSelected();
     }
   }
 
   // Save the values in the dyanmic lists to the hidden fields.
   function oneditsave(){
-    $('#node-input-domainhidden').val(domain_selected);
-    $('#node-input-srclanghidden').val(srclang_selected);
-    $('#node-input-destlanghidden').val(destlang_selected);
-    $('#node-input-basemodelhidden').val(base_model_selected);
-    $('#node-input-customhidden').val(custom_selected);
-    $('#node-input-ldparamshidden2').val(lg_parameters_selected2);
+    $('#node-input-domainhidden').val(txn.domain_selected);
+    $('#node-input-srclanghidden').val(txn.srclang_selected);
+    $('#node-input-destlanghidden').val(txn.destlang_selected);
+    $('#node-input-basemodelhidden').val(txn.base_model_selected);
+    $('#node-input-customhidden').val(txn.custom_selected);
+    $('#node-input-ldparamshidden2').val(txn.lg_parameters_selected2);
   }
 
   // Define and run the function to register this node.
diff --git a/services/language_translation/v2.js b/services/language_translation/v2.js
index 190d428f..104f72b1 100644
--- a/services/language_translation/v2.js
+++ b/services/language_translation/v2.js
@@ -175,21 +175,48 @@ module.exports = function (RED) {
 
       // If training is requested then the glossary will be a file input. We are using temp
       // to sync up the fetch of the file input stream, before invoking the train service.
+      // If the file comes from a file-inject then the file will not have a filename assoicated
+      // with it. In this case a temporary filename is given to the file. The file name submitted
+      // to the service cannot have a '.' else it will throw a 400 error.
       var doTrain = function(msg, model_id, filetype){
         node.status({
           fill: 'blue',
           shape: 'dot',
-          text: 'requesting training'
+          text: 'processing data buffer for training request'
         });
 
         temp.open({
           suffix: '.xml'
-        }, function(err, info){
-          if (!err) {
-            fs.write(info.fd, msg.payload);
+        }, function(err, info) {
+          if (err) {
+            node.status({
+              fill: 'red',
+              shape: 'dot',
+              text: 'Error receiving the data buffer for training'
+            });
+            throw err;
+          }
+
+          // Syncing up the asynchronous nature of the stream
+          // so that the full file can be sent to the API.
+          fs.writeFile(info.path, msg.payload, function(err) {
+            if (err) {
+              node.status({
+                fill: 'red',
+                shape: 'dot',
+                text: 'Error processing data buffer for training'
+              });
+              throw err;
+            }
+
             var params = {};
+
             // only letters and numbers allowed in the submitted file name
-            params.name = msg.filename.replace(/[^0-9a-z]/gi, '');
+            // Default the name to a string representing now
+            params.name = (new Date()).toString().replace(/[^0-9a-z]/gi, '');
+            if (msg.filename) {
+              params.name = msg.filename.replace(/[^0-9a-z]/gi, '');
+            }
             params.base_model_id = model_id;
             switch (filetype) {
             case 'forcedglossary':
@@ -226,11 +253,11 @@ module.exports = function (RED) {
                 }
               }
             );
-          }
+          });
         });
-        node.status({ });
       };
 
+
       // Fetch the status of the trained model. It can only be used if the model is available. This
       // will also return any training errors. The full error reason is returned in msg.translation
       var doGetStatus = function (msg, trainid) {
diff --git a/services/language_translator_identify/v2.html b/services/language_translator_identify/v2.html
index a7a2175d..dfff593b 100644
--- a/services/language_translator_identify/v2.html
+++ b/services/language_translator_identify/v2.html
@@ -35,7 +35,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
-    <p>Packaged in with release 0.4.21 of node-red-node-watson</p>
+    <p>Packaged in with release 0.4.25 of node-red-node-watson</p>
     <p>The Watson Language Translator service can be used to identify languages used in a text input. <p>
     <p>Node input : </p>
     <ul>