diff --git a/inc/python b/inc/python
index c7cbb52884..3d329b59a9 100644
--- a/inc/python
+++ b/inc/python
@@ -137,7 +137,7 @@ function pip_install {
 # get_from_global_requirements <package>
 function get_from_global_requirements {
     local package=$1
-    local required_pkg=$(grep -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
+    local required_pkg=$(grep -i -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
     if [[ $required_pkg == ""  ]]; then
         die $LINENO "Can't find package $package in requirements"
     fi
diff --git a/stack.sh b/stack.sh
index 69b76a9e19..9ecc49c7ca 100755
--- a/stack.sh
+++ b/stack.sh
@@ -714,6 +714,9 @@ fi
 # Extras Pre-install
 # ------------------
 
+# Install required infra support libraries
+install_infra
+
 # Phase: pre-install
 run_phase stack pre-install
 
@@ -733,9 +736,6 @@ fi
 
 echo_summary "Installing OpenStack project source"
 
-# Install required infra support libraries
-install_infra
-
 # Install Oslo libraries
 install_oslo