diff --git a/tools/build_doc.sh b/tools/build_doc.sh
index de7f21b..b1225c3 100755
--- a/tools/build_doc.sh
+++ b/tools/build_doc.sh
@@ -23,7 +23,8 @@ function extract_doc()
   html=${DOCS}/html/$(basename ${org%.org}.html)
   text=${DOCS}/text/$(basename ${org%.org}.txt)
 
-  ${srcdir}/tools/missing emacs --batch  \
+  ${srcdir}/tools/missing \
+        emacs --no-init-file --no-site-lisp --quick --batch \
         --load="${HTMLIZE}"           \
         --load="${CONFIG_DOC}"        \
         ${org}                           \
@@ -53,6 +54,7 @@ do
     # Fail if tangling failed
     if [ $rc -ne 0 ] ; then
        cat $exported
+       rm $exported
        exit $rc
     fi
 done
diff --git a/tools/tangle.sh b/tools/tangle.sh
index 1b1700b..947159e 100755
--- a/tools/tangle.sh
+++ b/tools/tangle.sh
@@ -30,7 +30,7 @@ function tangle()
         return
     fi
     ${srcdir}/tools/missing \
-        emacs --batch ${org_file} \
+        emacs --no-init-file --no-site-lisp --quick --batch ${org_file} \
          --load=${srcdir}/tools/config_tangle.el \
         -f org-babel-tangle
 }
@@ -47,6 +47,7 @@ do
     # Fail if tangling failed
     if [[ $rc -ne 0 ]] ; then
        cat $tangled
+       rm $tangled
        exit $rc
     fi
 done