More changes related to the variables in the GSG. Getting some odd results between local
and staging builds.