diff --git a/salt/_modules/telegraf.py b/salt/_modules/telegraf.py
index ee564a44d..6fa33f89a 100644
--- a/salt/_modules/telegraf.py
+++ b/salt/_modules/telegraf.py
@@ -6,7 +6,7 @@ import socket
 
 def send(data):
 
-  mainint = __salt__['pillar.get']('node:mainint')
+  mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('master:mainint'))
   mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0]
   dstport = 8094
 
diff --git a/setup/so-functions b/setup/so-functions
index a93812b68..021f43ed2 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -947,7 +947,7 @@ network_setup() {
         fi
 
         echo "... Copying 99-so-checksum-offload-disable";
-        cp "$SCRIPTDIR/install_scripts/99-so-checksum-offload-disable" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ;
+        cp "$SCRIPTDIR"/install_scripts/99-so-checksum-offload-disable /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ;
 
         echo "... Modifying 99-so-checksum-offload-disable";
         sed -i "s/\$MAININT/${MAININT}/g" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable;