diff --git a/measurement.html b/measurement.html
index bab56f6..ea30165 100644
--- a/measurement.html
+++ b/measurement.html
@@ -61,7 +61,7 @@
     icon: "font-awesome/fa-sliders",
 
     label: function () {
-      return this.positionIcon + " " + this.assetType || "Measurement";
+      return (this.positionIcon || "") + " " + (this.assetType || "Measurement");
     },
     
     oneditprepare: function() {
diff --git a/src/nodeClass.js b/src/nodeClass.js
index fc46108..26a6baf 100644
--- a/src/nodeClass.js
+++ b/src/nodeClass.js
@@ -140,8 +140,8 @@ class nodeClass {
     this.source.tick();
 
     const raw = this.source.getOutput();
-    const processMsg = this._output.formatMsg(raw, this.config, 'process');
-    const influxMsg  = this._output.formatMsg(raw, this.config, 'influxdb');
+    const processMsg = this._output.formatMsg(raw, this.source.config, 'process');
+    const influxMsg  = this._output.formatMsg(raw, this.source.config, 'influxdb');
 
     // Send only updated outputs on ports 0 & 1
     this.node.send([processMsg, influxMsg]);