diff --git a/scripts/find_unused_symbols.sh b/scripts/find_unused_symbols.sh
index 090f6de4323eee8fb6628e2572227552f02b41d0..1a6d93745ff51cdb8a382f8b6f82fbb4df7a71db 100755
--- a/scripts/find_unused_symbols.sh
+++ b/scripts/find_unused_symbols.sh
@@ -33,7 +33,6 @@
 options=$1
 WORKDIR=..
 OBJDIR=obj
-EXECUTABLES="${WORKDIR}/IVAS_cod ${WORKDIR}/IVAS_dec ${WORKDIR}/IVAS_rend"
 
 evaluateTables=1
 evaluateFunctions=1
@@ -43,7 +42,7 @@ help=0
 while getopts ":ftnhd:" OPT; do
   case "$OPT" in
     d)
-       WORKDIR="${OPTARG}"
+       WORKDIR=$(realpath -s "${OPTARG}")
        ;;
     f)
        evaluateFunctions=1
@@ -77,18 +76,31 @@ fi
 
 # print C-code directory
 echo "C-code directory set to ${WORKDIR}"
+WORKDIR_EXE=${WORKDIR//" "/"\ "}
+EXECUTABLES="${WORKDIR_EXE}/IVAS_cod ${WORKDIR_EXE}/IVAS_dec ${WORKDIR_EXE}/IVAS_rend"
 
 # build
 if [ $compile -ne 0 ]; then
-  make -C ${WORKDIR} DEBUG=0 STRIP=1 clean all 1>&2
+  make -C "${WORKDIR}" clean && make -j -C "${WORKDIR}" DEBUG=0 STRIP=1 all 1>&2
+  echo ""
 fi
 
+# check, whether executables exist
+for i in $EXECUTABLES
+do
+    if [ ! -f "$i" ]; then
+        echo "Executable $i not found. Aborting"
+        echo ""
+        exit
+    fi
+done
+
 if [ $evaluateFunctions != 0 ]; then
   # delete text files
   rm -f functions_obj.txt functions_exe.txt 1>&2
 
   # find all functions in object files
-  nm ${WORKDIR}/${OBJDIR}/*.o | grep "^[0-9a-f]* T " | sed 's/^[0-9a-f]* T //' | sort -u > functions_obj.txt
+  nm "${WORKDIR}/${OBJDIR}/"*.o | grep "^[0-9a-f]* T " | sed 's/^[0-9a-f]* T //' | sort -u > functions_obj.txt
   # find all symbols in final executables
   nm ${EXECUTABLES} | grep "^[0-9a-f]* T " | sed 's/^[0-9a-f]* T //' | sort -u > functions_exe.txt 
 
@@ -104,7 +116,7 @@ if [ $evaluateTables -ne 0 ]; then
   rm -f tables_obj.txt tables_exe.txt 1>&2
 
   # find all functions in object files
-  nm ${WORKDIR}/${OBJDIR}/*.o | grep "^[0-9a-f]* [RD] " | sed 's/^[0-9a-f]* [RD] //' | sort -u > tables_obj.txt
+  nm "${WORKDIR}/${OBJDIR}/"*.o | grep "^[0-9a-f]* [RD] " | sed 's/^[0-9a-f]* [RD] //' | sort -u > tables_obj.txt
   # find all symbols in final executables
   nm ${EXECUTABLES} | grep "^[0-9a-f]* [RD] " | sed 's/^[0-9a-f]* [RD] //' | sort -u > tables_exe.txt 
 
diff --git a/scripts/prepare_delivery.sh b/scripts/prepare_delivery.sh
index 5f55895f58afffed29f4dfa69fce27d02ded4753..06c889f2402af667fdd7b8d973a0f72394708781 100755
--- a/scripts/prepare_delivery.sh
+++ b/scripts/prepare_delivery.sh
@@ -108,6 +108,8 @@ sed -i.bak -e '/lib_debug\\debug.[ch]/d' ${OUTDIR}/Workspace_msvc/lib_debug.vcxp
 sed -i.bak -e '/lib_debug\\sba_debug.[ch]/d' ${OUTDIR}/Workspace_msvc/lib_debug.vcxproj
 sed -i.bak -e '/lib_debug\\snr.c/d' ${OUTDIR}/Workspace_msvc/lib_debug.vcxproj
 rm -f ${OUTDIR}/Workspace_msvc/lib_debug.vcxproj.bak
+rm -f ${OUTDIR}/lib_util/tsm_scale_file_reader.[ch]
+
 
 # readme
 cp ${ROOT}/readme.txt ${OUTDIR}