diff --git a/manifests/init.pp b/manifests/init.pp
index e7ffa3943..c90e056ed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -77,7 +77,7 @@
     }
 
     $aio_upgrade_required = ($is_pe == false and $_expected_package_version != undef) or
-      ($::aio_agent_version != undef and $_expected_package_version != undef and
+      (getvar('::aio_agent_version') != undef and $_expected_package_version != undef and
         versioncmp("${::aio_agent_version}", "${_expected_package_version}") < 0)
 
     if $::architecture == 'x86' and $arch == 'x64' {
diff --git a/manifests/prepare.pp b/manifests/prepare.pp
index 8b459326d..abe2a5093 100644
--- a/manifests/prepare.pp
+++ b/manifests/prepare.pp
@@ -67,13 +67,13 @@
       }
 
       # The mco_*_config facts will return the location of mcollective config (or nil), prefering PE over FOSS.
-      if $::mco_server_config {
+      if getvar('::mco_server_config') {
         class { 'puppet_agent::prepare::mco_server_config':
           before => Class[$_osfamily_class],
         }
         contain puppet_agent::prepare::mco_server_config
       }
-      if $::mco_client_config {
+      if getvar('::mco_client_config') {
         class { 'puppet_agent::prepare::mco_client_config':
           before => Class[$_osfamily_class],
         }