diff --git a/src/main/resources/bitrock/tomcat.xml b/src/main/resources/bitrock/tomcat.xml
index 37776d1ca5..3e5c607ecc 100644
--- a/src/main/resources/bitrock/tomcat.xml
+++ b/src/main/resources/bitrock/tomcat.xml
@@ -531,7 +531,7 @@ export LD_LIBRARY_PATH
                     <path>${application_server_directory}/bin/setenv.bat</path>
                     <text>set JAVA_HOME=${java_home_directory.dos}
 set JRE_HOME=%JAVA_HOME%
-set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JAVA_OPTS%
+set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows}
 </text>
                     <ruleList>
                         <platformTest type="windows"/>
@@ -542,7 +542,7 @@ set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JA
                     <path>${application_server_directory}/bin/setenv.bat</path>
                     <text>set JAVA_HOME=${java_home_directory.dos}
 set JRE_HOME=%JAVA_HOME%\jre
-set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JAVA_OPTS%
+set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows}
 </text>
                     <ruleList>
                         <platformTest type="windows"/>
diff --git a/src/main/resources/extract-binaries.xml b/src/main/resources/extract-binaries.xml
index 47b97c612e..a68bb9f445 100644
--- a/src/main/resources/extract-binaries.xml
+++ b/src/main/resources/extract-binaries.xml
@@ -47,6 +47,8 @@
             <!-- Accommodate poor Cygwin users -->
             <pathconvert property="maven.localrepo" targetos="unix">
                 <map from="C:" to="/c" />
+                <map from="D:" to="/d" />
+                <map from="E:" to="/e" />
                 <path>
                     <pathelement path="${settings.localRepository}"/>
                 </path>