diff --git a/extras/post-install.sh b/extras/post-install.sh
index 9f7550db04398da04c0dfd3a8fb09788776edcd9..0f5a249af46d2796f3af1b3db7a02571c2f14d53 100644
--- a/extras/post-install.sh
+++ b/extras/post-install.sh
@@ -13,9 +13,11 @@
 #
 # Todo:
 # - Copy doc to /usr/share/doc
+# - Check if MySQL user/database exist before creating
 # - General cleanup
 
 set -e
+set -u
 
 COLOR_INFO='\033[32m'
 COLOR_WARNING='\033[33m'
@@ -155,9 +157,11 @@ EOF
 echo -e "${COLOR_INFO}Populating Mapping table with NCBI data (hg18)${COLOR_END}"
 
 # Populate Mapping table with NCBI data (hg18)
-wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.36.3/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md
+MAPPING=$(mktemp)
+wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.36.3/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING
 echo -e "${COLOR_INFO}Importing NCBI mapping data, this may take a few minutes (hg18)${COLOR_END}"
-$($BIN_MAPPING_UPDATE hg18 /tmp/seq_gene.md reference)
+$($BIN_MAPPING_UPDATE hg18 $MAPPING reference)
+rm $MAPPING
 
 echo -e "${COLOR_INFO}Creating tables in hg19 database${COLOR_END}"
 
@@ -223,10 +227,12 @@ EOF
 echo -e "${COLOR_INFO}Populating Mapping table with NCBI data (hg19)${COLOR_END}"
 
 # Populate Mapping table with UCSC data (hg19)
-#wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md
-wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.37.2/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md
+MAPPING=$(mktemp)
+#wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING
+wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.37.2/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING
 echo -e "${COLOR_INFO}Importing NCBI mapping data, this may take a few minutes (hg19)${COLOR_END}"
-$($BIN_MAPPING_UPDATE hg19 /tmp/seq_gene.md 'GRCh37.p2-Primary Assembly')
+$($BIN_MAPPING_UPDATE hg19 $MAPPING 'GRCh37.p2-Primary Assembly')
+rm $MAPPING
 
 echo -e "${COLOR_INFO}Creating tables in mutalyzer database${COLOR_END}"
 
diff --git a/extras/post-upgrade.sh b/extras/post-upgrade.sh
index 37ae527a2e4f1f713cc99736caf6e926a4b4991e..b6224d7619607400404abbf3c027df5e29d75ec9 100644
--- a/extras/post-upgrade.sh
+++ b/extras/post-upgrade.sh
@@ -12,6 +12,7 @@
 #   sudo bash extras/post-upgrade.sh
 
 set -e
+set -u
 
 COLOR_INFO='\033[32m'
 COLOR_WARNING='\033[33m'
diff --git a/extras/pre-install.sh b/extras/pre-install.sh
index a49e65bc0ac8b1d293f0dd915fd84d67e508acf5..64fa30340b7ad849e1428935317e89835dde9faa 100644
--- a/extras/pre-install.sh
+++ b/extras/pre-install.sh
@@ -12,6 +12,7 @@
 #   sudo bash extras/pre-install.sh
 
 set -e
+set -u
 
 COLOR_INFO='\033[32m'
 COLOR_WARNING='\033[33m'
@@ -44,15 +45,10 @@ apt-get install -y \
 
 echo -e "${COLOR_INFO}Installing latest soaplib from git master${COLOR_END}"
 
-mkdir -p /tmp/mutalyzer-install
-pushd /tmp/mutalyzer-install
-
-git clone https://github.com/soaplib/soaplib.git
-cd soaplib
+pushd $(mktemp -d)
+git clone https://github.com/soaplib/soaplib.git .
 python setup.py install
-
 popd
-rm -Rf /tmp/mutalyzer-install
 
 echo -e "${COLOR_INFO}Installing suds using easy_install${COLOR_END}"