diff --git a/import-marc.bat b/import-marc.bat
index c4322107e00484ff397fce441752e910a5fe71a6..2a2bcc963813d4f9bc01174c32d962c09fa038ce 100644
--- a/import-marc.bat
+++ b/import-marc.bat
@@ -60,7 +60,7 @@ set EXTRA_SOLRMARC_SETTINGS=%EXTRA_SOLRMARC_SETTINGS%  -Dsolr.core.name=%SOLRCOR
 rem ##################################################
 rem # Set VUFIND_HOME
 rem ##################################################
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
 rem VUFIND_HOME not set -- try to call env.bat to 
 rem fix the problem before we give up completely
 if exist env.bat goto useenvbat
@@ -73,7 +73,7 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
 goto vufindhomefound
 :useenvbat
 call env > nul
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
 echo You need to set the VUFIND_HOME environmental variable before running this script.
 goto end
 :vufindhomefound
@@ -81,11 +81,11 @@ goto end
 rem #####################################################
 rem # Build java command
 rem #####################################################
-if not (!%JAVA_HOME%!)==(!!) goto javahomefound
+if not "!%JAVA_HOME%!"=="!!" goto javahomefound
 set JAVA=java
 goto javaset
 :javahomefound
-set JAVA=%JAVA_HOME%\bin\java
+set JAVA="%JAVA_HOME%\bin\java"
 :javaset
 
 rem ##################################################
diff --git a/index-alphabetic-browse.bat b/index-alphabetic-browse.bat
index ceccbb467fafb7b957ec515f1201899d24284eae..d3fa462b43d1c25f45ac7d947dc8c7f2236360a9 100644
--- a/index-alphabetic-browse.bat
+++ b/index-alphabetic-browse.bat
@@ -12,7 +12,7 @@ goto end
 rem ##################################################
 rem # Set SOLR_HOME
 rem ##################################################
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
 rem VUFIND_HOME not set -- try to call env.bat to 
 rem fix the problem before we give up completely
 if exist env.bat goto useenvbat
@@ -25,22 +25,22 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
 goto vufindhomefound
 :useenvbat
 call env > nul
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
 echo You need to set the VUFIND_HOME environmental variable before running this script.
 goto end
 :vufindhomefound
-if not (!%SOLR_HOME%!)==(!!) goto solrhomefound
+if not "!%SOLR_HOME%!"=="!!" goto solrhomefound
 set SOLR_HOME=%VUFIND_HOME%\solr\vufind
 :solrhomefound
 
 rem #####################################################
 rem # Build java command
 rem #####################################################
-if not (!%JAVA_HOME%!)==(!!) goto javahomefound
+if not "!%JAVA_HOME%!"=="!!" goto javahomefound
 set JAVA=java
 goto javaset
 :javahomefound
-set JAVA=%JAVA_HOME%\bin\java
+set JAVA="%JAVA_HOME%\bin\java"
 :javaset
 
 cd %VUFIND_HOME%\import
diff --git a/solr.bat b/solr.bat
index fbce82ff4b61b5db258cdb604a8b55d9d8bcb75e..cff8418c1252537236020d60f85dd237f15b3049 100644
--- a/solr.bat
+++ b/solr.bat
@@ -40,8 +40,8 @@ rem Unrecognized action -- display help text
 if "!%1!"=="!!" goto usage
 
 rem Set VUFIND_HOME (if not already set)
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
-rem VUFIND_HOME not set -- try to call env.bat to 
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
+rem VUFIND_HOME not set -- try to call env.bat to
 rem fix the problem before we give up completely
 if exist env.bat goto useenvbat
 rem If env.bat doesn't exist, the user hasn't run the installer yet.
@@ -53,7 +53,7 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
 goto vufindhomefound
 :useenvbat
 call env > nul
-if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
+if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
 echo You need to set the VUFIND_HOME environmental variable before running this script.
 goto end
 :vufindhomefound