diff --git a/common/foundry_install.py b/common/foundry_install.py
index f44ba3a..42846c3 100755
--- a/common/foundry_install.py
+++ b/common/foundry_install.py
@@ -975,7 +975,7 @@
                     create_lef_library(destlibdir, compname, do_compile_only, excludelist)
 
                 if do_compile_only == True:
-                    if newname:
+                    if newname and targname:
                         if os.path.isfile(targname):
                             os.remove(targname)
 
@@ -1082,6 +1082,7 @@
             for item in option:
                 if item.split('=')[0] == 'options':
                     tclscript = item.split('=')[1]
+                    tcllines = []
                     print('Adding Tcl script options from file ' + tclscript)
 
 	# Option 'noconvert' is a standalone keyword.
@@ -1126,6 +1127,16 @@
     devlist = []
     pdklibrary = None
 
+    if tclscript:
+        # If tclscript is a file, then read it.  Otherwise, assume
+        # that the option contents should be inserted verbatim.
+        if os.path.isfile(tclscript):
+            with open(tclscript, 'r') as ifile:
+                tcllines = ifile.read().splitlines()
+        else:
+            tcllines = list(tclscript)
+
+
     if have_gds and not no_gds_convert:
         print("Migrating GDS files to layout.")
 
@@ -1235,15 +1246,6 @@
                 # .mag files from the database.
 
                 print('Creating magic generation script to generate magic database files.') 
-                if tclscript:
-                    # If tclscript is a file, then read it.  Otherwise, assume
-                    # that the option contents should be inserted verbatim.
-                    if os.path.isfile(tclscript):
-                        with open(tclscript, 'r') as ifile:
-                            tcllines = ifile.read().splitlines()
-                    else:
-                        tcllines = list(tclscript)
-
                 with open(destlibdir + '/generate_magic.tcl', 'w') as ofile:
                     print('#!/usr/bin/env wish', file=ofile)
                     print('#--------------------------------------------', file=ofile)
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 55cdf4b..2d4b404 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -524,7 +524,7 @@
 	rm -f ${MAGIC_STAGING_A}/${SKY130A}.tcl
 	rm -f ${MAGIC_STAGING_A}/${SKY130A}-BindKeys
 	rm -f ${MAGIC_STAGING_A}/magicrc
-	if "${EF_STYLE}" == "1" ; then \
+	if test "${EF_STYLE}" == "1" ; then \
 	    (cd ${MAGICTOP_STAGING_A} ; ln -s ${REV_DIR} current) ; \
 	fi
 	cp -rp custom/scripts/seal_ring_generator ${MAGIC_STAGING_A}/.