diff --git a/GPL/CabExtract/build.gradle b/GPL/CabExtract/build.gradle
index df8dadbc0a..4b65dd3dd2 100644
--- a/GPL/CabExtract/build.gradle
+++ b/GPL/CabExtract/build.gradle
@@ -13,7 +13,6 @@ eclipse.project.name = 'GPL CabExtract'
 
 project.ext.cabextract = "cabextract-1.6"
 
-
 /*********************************************************************************
  * CabExtract extraction task
  *
@@ -24,7 +23,7 @@ project.ext.cabextract = "cabextract-1.6"
  * NOTE: Ant is used so that timestamps are properly preserved, failure to 
  * do so can cause the aclocal utility to be required which may be missing!
  *********************************************************************************/
- task unpackCabExtract (type: Copy) {
+task unpackCabExtract (type: Copy) {
  
  	doFirst {
  		delete file("build/${cabextract}")
@@ -43,18 +42,19 @@ project.ext.cabextract = "cabextract-1.6"
 	// Force the task to be executed every time by setting to false.
 	// This is done since configure changes the contents for a platform
 	outputs.upToDateWhen { false }
- }
+}
 
 /*********************************************************************************
  * CabExtract platform specific tasks
  *
  * The cabextract tool requires that its 'configure' script is called before make.
  *********************************************************************************/
-['linux64', 'osx64'].each { platform ->
+def currentPlatform = getCurrentPlatformName()
+if (['linux64', 'osx64'].contains(currentPlatform)) {
 		
-	def configureName = "${platform}CabExtractConfigure"
-	def makeName = "${platform}CabExtractMake" // native Make task found automatically
-	
+	def configureName = "${currentPlatform}CabExtractConfigure"
+	def makeName = "${currentPlatform}CabExtractMake" // native Make task found automatically
+
 	task (configureName, type: Exec) {
 		group "private"
 		workingDir "build/${cabextract}"
@@ -70,10 +70,8 @@ project.ext.cabextract = "cabextract-1.6"
 		doLast {
 			copy {
 				from "build/${cabextract}/cabextract"
-				into "build/os/${platform}"
+				into "build/os/${currentPlatform}"
 			}
 		}
 	}
-}
-
-
+}
\ No newline at end of file
diff --git a/GPL/build.gradle b/GPL/build.gradle
index 0158d7a889..1c21e360d2 100644
--- a/GPL/build.gradle
+++ b/GPL/build.gradle
@@ -71,7 +71,3 @@ String getGhidraRelativePath(Project p) {
 
 	return path
 }
-
-subprojects {
-	apply plugin: 'java'
-}
diff --git a/gradle/support/extensionCommon.gradle b/gradle/support/extensionCommon.gradle
index 1d44182236..d4ff82e0da 100644
--- a/gradle/support/extensionCommon.gradle
+++ b/gradle/support/extensionCommon.gradle
@@ -60,10 +60,12 @@ task zipExtensions (type: Zip) {
 	// EXTERNAL LIBS
 	/////////////////
 	gradle.taskGraph.whenReady { taskGraph ->
-		List<String> externalPaths = getExternalDependencies(p)
-		externalPaths.each { path ->
-			from (path) {
-				into { getBaseProjectName(p) + "/lib" }
+		if (project.plugins.withType(JavaPlugin)) {
+			List<String> externalPaths = getExternalDependencies(p)
+			externalPaths.each { path ->
+				from (path) {
+					into { getBaseProjectName(p) + "/lib" }
+				}
 			}
 		}
 	}