diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 96723b8..ba663ca 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -838,7 +838,7 @@ function _drush_bootstrap_drupal_configuration() {
     'dev_query' => FALSE, // Force Drupal6 not to store queries since we are not outputting them.
     'cron_safe_threshold' => 0, // Don't run poormanscron during Drush request (D7+).
   );
-  // Avoid MTimeProtected grief in D8+. See http://drupal.org/node/1899842. If you really don't
+  // Avoid MTimeProtected grief in D8+. See http://drupal.org/node/1899842. If you really don't
   // want this override, set different values using a drushrc.php by passing different values.
   $override['php_storage']['default'] = array(
     'class' => 'Drupal\Component\PhpStorage\FileReadOnlyStorage',
@@ -960,7 +960,7 @@ function _drush_bootstrap_drupal_full() {
   }
   else {
     // No cached entry so write to cache.
-    $install_profile = drush_drupal_major_version >= 7 ? drupal_get_profile() : variable_get('install_profile', 'standard');
+    $install_profile = drush_drupal_major_version() >= 7 ? drupal_get_profile() : variable_get('install_profile', 'standard');
     drush_cache_set($cid, $install_profile);
   }

diff --git a/includes/drupal.inc b/includes/drupal.inc
index b5b7c9f..0450518 100644
--- a/includes/drupal.inc
+++ b/includes/drupal.inc
@@ -252,6 +252,6 @@ function _drush_drupal_parse_info_file($data, $merge_item = NULL) {
  */
 function drush_cid_install_profile() {
   // Todo: this CID needs to be site-specific and ideally would change if a site got reinstalled.
-  return drush_get_cid('install_profile', array(), array());
+  return drush_get_cid('install_profile', array(), array(drush_get_context('DRUSH_SELECTED_DRUPAL_SITE_CONF_PATH')));
 }