diff --git a/build.gradle b/build.gradle
index 0871a13c9e..6c0fb44c60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,12 +84,21 @@ project(":core") {
     apply plugin: "java"
 
     dependencies {
-        if(new File('../uCore').exists()){
+        boolean comp = System.properties["release"] == null || System.properties["release"].equals("false");
+
+        if(!comp){
+            println("NOTICE: Compiling release build.")
+        }else{
+            println("Compiling DEBUG build.");
+        }
+
+        if(new File('../uCore').exists() && comp){
             compile project(":uCore")
         }else{
             compile "com.github.anuken:ucore:$uCoreVersion"
         }
-        if(new File('../GDXGifRecorder').exists()) {
+
+        if(new File('../GDXGifRecorder').exists() && comp) {
             compile project(":GDXGifRecorder")
         }
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
diff --git a/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java b/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
index a7fd43ca19..6beeb53919 100644
--- a/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
@@ -57,10 +57,10 @@ public class MindustrySettingsDialog extends SettingsDialog{
 		menu.row();
 		menu.addButton("Sound", () -> visible(2));
 
-		//if(!Vars.android) {
-		menu.row();
-		menu.addButton("Controls", () -> Vars.ui.showControls());
-		//}
+		if(!Vars.android) {
+			menu.row();
+			menu.addButton("Controls", () -> Vars.ui.showControls());
+		}
 
 		prefs.clearChildren();
 		prefs.add(menu);
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 8fa46de6d0..d6868bb49e 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -50,8 +50,10 @@ ext.getPlatform = {
 
 	if (project.hasProperty("platform")) {
 		def lc = platform.toLowerCase()
-		if(lc.equals("windows")){
-			return "windows64";
+		if(lc.equals("windows64")) {
+            return "windows64";
+        }else if(lc.equals("windows32")){
+            return "windows32";
 		}else if(lc.equals("linux")){
 			return "linux64";
 		}else if(lc.equals("mac")){
diff --git a/settings.gradle b/settings.gradle
index 344ba1d489..58324176eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,15 @@
 include 'desktop', 'html', 'core', 'android'
 
-if (new File(settingsDir, '../uCore').exists()) {
-    include ':uCore'
-    project(':uCore').projectDir = new File(settingsDir, '../uCore')
-}
+if(System.properties["release"] == null || System.properties["release"].equals("false")){
+    if (new File(settingsDir, '../uCore').exists()) {
+        include ':uCore'
+        project(':uCore').projectDir = new File(settingsDir, '../uCore')
+    }
 
-if (new File(settingsDir, '../GDXGifRecorder').exists()) {
-    include ':GDXGifRecorder'
-    project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder')
+    if (new File(settingsDir, '../GDXGifRecorder').exists()) {
+        include ':GDXGifRecorder'
+        project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder')
+    }
+}else{
+    println("Not including local repositories.")
 }