diff --git a/contrib/drivers/plugins/com.ibm.db2.jdbc/META-INF/MANIFEST.MF b/contrib/drivers/plugins/com.ibm.db2.jdbc/META-INF/MANIFEST.MF
index fae4e6d29c72be521b97b1b90db2dff6a60ab90f..c74eec70ebae2650076dda57b700683fa31cf16a 100644
--- a/contrib/drivers/plugins/com.ibm.db2.jdbc/META-INF/MANIFEST.MF
+++ b/contrib/drivers/plugins/com.ibm.db2.jdbc/META-INF/MANIFEST.MF
@@ -35,3 +35,4 @@ Export-Package:
  sqlj.runtime.profile.util,
  sqlj.runtime.ref,
  sqlj.runtime.util
+Eclipse-BundleShape: dir
diff --git a/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF b/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
index 2134195ba8407d5f964eebbee444be98417dcceb..69d429ce18eff56b8e1f7b186765cf345101331b 100644
--- a/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
+++ b/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
@@ -62,3 +62,4 @@ Export-Package: oracle.core.lmx,
  oracle.xml.xqxp.functions.builtIns,
  oracle.xml.xslt,
  org.w3c.dom.validation
+Eclipse-BundleShape: dir
diff --git a/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml b/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
index 8745eca2e009f8edc28c590fe8ec7604a0cc6bbc..49c49bc3782d71c462244f31161cc75562bbc368 100644
--- a/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
@@ -27,7 +27,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
    <plugin
          id="com.ibm.db2.jdbc"
diff --git a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml b/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
index 99dfae1a7a5653cd93ff6a8006d407a56ec5d245..92af7a1e84d0d4d1f728f1186a08b2264d8846bb 100644
--- a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
@@ -27,7 +27,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
    <plugin
          id="com.oracle.jdbc"
diff --git a/pom.xml b/pom.xml
index a2ca12af43b9113e2c143728facdda4b730bb19a..5562ae5d6a951bd1d972f3553a46ed8e24d83182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,11 @@
 						</artifact>
 					</target-->
 					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>