diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml
index 096f210da..eab0f6180 100644
--- a/roles/8-mgmt-tools/tasks/main.yml
+++ b/roles/8-mgmt-tools/tasks/main.yml
@@ -30,7 +30,7 @@
 - name: SUGAR-STATS
   include_role:
     name: sugar-stats
-  when: sugar_stats_install and ansible_distribution != "CentOS"
+  when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS"
   tags: olpc, sugar-stats
 
 - name: TEAMVIEWER
@@ -48,7 +48,7 @@
 - name: XOVIS
   include_role:
     name: xovis
-  when: xovis_install and ansible_distribution != "CentOS"
+  when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS"
   tags: xovis
 
 - name: Recording STAGE 8 HAS COMPLETED ======================
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 3d2e7ec42..65b956177 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -78,7 +78,7 @@
 #  set_fact:
 #    py_captive_portal_install: True
 
-- name: (Re)Installing captive portal
+- name: (Re)Installing Captive Portal
   include_tasks: captive_portal.yml
   when: py_captive_portal_install