diff --git a/scripts/module_installer.sh b/scripts/module_installer.sh
index e00959bcb..0ec26ba5f 100644
--- a/scripts/module_installer.sh
+++ b/scripts/module_installer.sh
@@ -39,13 +39,9 @@ fi
 # Legacy Support
 #################
 
-# Global vars
 TMPDIR=/dev/tmp
 PERSISTDIR=/sbin/.magisk/mirror/persist
 
-rm -rf $TMPDIR 2>/dev/null
-mkdir -p $TMPDIR
-
 is_legacy_script() {
   unzip -l "$ZIPFILE" install.sh | grep -q install.sh
   return $?
@@ -64,6 +60,18 @@ print_modname() {
   ui_print "*******************"
 }
 
+# Override abort as old scripts have some issues
+abort() {
+  ui_print "$1"
+  $BOOTMODE || recovery_cleanup
+  [ -n $MODPATH ] && rm -rf $MODPATH
+  rm -rf $TMPDIR
+  exit 1
+}
+
+rm -rf $TMPDIR 2>/dev/null
+mkdir -p $TMPDIR
+
 # Preperation for flashable zips
 setup_flashable
 
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index 8dc05dbd9..78d40e6ca 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -47,6 +47,8 @@ is_mounted() {
 abort() {
   ui_print "$1"
   $BOOTMODE || recovery_cleanup
+  [ -n $MODPATH ] && rm -rf $MODPATH
+  rm -rf $TMPDIR
   exit 1
 }
 
@@ -642,8 +644,9 @@ install_module() {
   unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2
   [ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!"
 
+  local MODDIRNAME
   $BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules
-  MODULEROOT=$NVBASE/$MODDIRNAME
+  local MODULEROOT=$NVBASE/$MODDIRNAME
   MODID=`grep_prop id $TMPDIR/module.prop`
   MODPATH=$MODULEROOT/$MODID
   MODNAME=`grep_prop name $TMPDIR/module.prop`
@@ -732,11 +735,11 @@ install_module() {
 
 MAGISKTMP=/sbin/.magisk
 NVBASE=/data/adb
-[ -z $TMPDIR ] && TMPDIR=/dev/tmp
+TMPDIR=/dev/tmp
 
 # Bootsigner related stuff
 BOOTSIGNERCLASS=a.a
-BOOTSIGNER="/system/bin/dalvikvm -Xnoimage-dex2oat -cp \$APK \$BOOTSIGNERCLASS"
+BOOTSIGNER='/system/bin/dalvikvm -Xnoimage-dex2oat -cp $APK $BOOTSIGNERCLASS'
 BOOTSIGNED=false
 
 resolve_vars