diff --git a/bash/main.sh b/bash/main.sh
index 6f8d766..c2d0d68 100755
--- a/bash/main.sh
+++ b/bash/main.sh
@@ -36,8 +36,6 @@
 RECEIVER_ROOT_DIRECTORY="${PWD}"
 RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
 RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
-RECEIVER_OS_DISTRIBUTION=`. /etc/os-release; echo ${ID/*, /}`
-RECEIVER_OS_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
 
 ## INCLUDE EXTERNAL SCRIPTS
 
diff --git a/bash/portal/install.sh b/bash/portal/install.sh
index d7e0856..243ed7a 100755
--- a/bash/portal/install.sh
+++ b/bash/portal/install.sh
@@ -73,7 +73,6 @@ fi
 echo -e "\e[95m  Installing packages needed to fulfill dependencies...\e[97m"
 echo -e ""
 CheckPackage lighttpd
-CheckPackage bc
 
 # Assign the Lighthttpd document root directory to a variable.
 RAW_DOCUMENT_ROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
@@ -262,7 +261,7 @@ CheckPackage collectd-core
 CheckPackage rrdtool
 
 # Portal dependencies.
-if [ $RECEIVER_MTA == "POSTFIX" ] || [ -z "$RECEIVER_MTA" ]; then
+if [ "$RECEIVER_MTA" == "POSTFIX" ] || [ -z "$RECEIVER_MTA" ]; then
     CheckPackage postfix
 fi
 
diff --git a/install.sh b/install.sh
index 3d6b79a..39e710d 100755
--- a/install.sh
+++ b/install.sh
@@ -44,6 +44,8 @@ ENABLE_LOGGING="false"
 export RECEIVER_ROOT_DIRECTORY="${PWD}"
 export RECEIVER_BASH_DIRECTORY="${PWD}/bash"
 export RECEIVER_BUILD_DIRECTORY="${PWD}/build"
+export RECEIVER_OS_DISTRIBUTION=`. /etc/os-release; echo ${ID/*, /}`
+export RECEIVER_OS_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
 
 ## SOURCE EXTERNAL SCRIPTS