diff --git a/roles/mailchimpLastlogin/templates/ldapconfig.yml.j2 b/roles/mailchimpLastlogin/templates/ldapconfig.yml.j2
index 99d5f3e96f552fbb48cbf64d77f97fa0e8708545..90419b2c003ab9afbe5ee608f32c6ad15c1633e6 100644
--- a/roles/mailchimpLastlogin/templates/ldapconfig.yml.j2
+++ b/roles/mailchimpLastlogin/templates/ldapconfig.yml.j2
@@ -2,5 +2,5 @@
 ldapDomain: {{ ldapBase }}
 user: {{ ldapBindDN }} 
 passwd: {{ ldapBindDNPassword }}
-ldapURI: {{ ldap URI }}
+ldapURI: {{ ldapURI }}
 cafile: {{ ldapCaCertFile }}
diff --git a/roles/mellanox_drivers/vars/mellanoxVars.yml b/roles/mellanox_drivers/defaults/main.yml
similarity index 100%
rename from roles/mellanox_drivers/vars/mellanoxVars.yml
rename to roles/mellanox_drivers/defaults/main.yml
diff --git a/roles/mellanox_drivers/tasks/main.yml b/roles/mellanox_drivers/tasks/main.yml
index c084b9dad15290738693e02c00253f3f739a1e48..a313e581f3adbb7b07e119fb522c0a8a9c8a46eb 100644
--- a/roles/mellanox_drivers/tasks/main.yml
+++ b/roles/mellanox_drivers/tasks/main.yml
@@ -5,7 +5,7 @@
   shell: "lspci | grep Mellanox"
   check_mode: yes
 
-- include_vars: mellanoxVars.yml
+#- include_vars: mellanoxVars.yml
 
 - name: yum install dependencies
   yum:  name=perl,pciutils,gtk2,atk,cairo,gcc-gfortran,libxml2-python,tcsh,libnl,lsof,tcl,tk,kernel-devel,python-devel,createrepo,rpm-build
diff --git a/roles/nat_server/tasks/main.yml b/roles/nat_server/tasks/main.yml
index 1e7fd39b588a527b2c65db2246510e87afea19c8..6c56c0ce8b10d821baee37ebf990ceb3ca82c47d 100644
--- a/roles/nat_server/tasks/main.yml
+++ b/roles/nat_server/tasks/main.yml
@@ -23,6 +23,8 @@
   # output looks like
   # 8.8.8.8 via 118.138.254.254 dev eth2  src 118.138.254.185
   shell: /usr/sbin/ip route get 8.8.8.8  | awk '{print $5;exit }'
+  check_mode: no
+  changed_when: false
   register: public_device_name
 
 #if not defined, default to M3=vlan 114  ;