diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index fa3d1c397..13369a6f3 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -1147,19 +1147,35 @@ class CommandLineTools {
 				
 				if (define == define.toUpperCase ()) {
 					
+					var value = config.defines.get (define);
+					
 					switch (define) {
 						
-						case "ANT_HOME", "JAVA_HOME":
+						case "ANT_HOME":
 							
-							if (FileSystem.exists (config.defines.get (define))) {
+							if (value == "/usr") {
 								
-								Sys.putEnv (define, config.defines.get (define));
+								value = "/usr/share/ant";
+								
+							}
+							
+							if (FileSystem.exists (value)) {
+								
+								Sys.putEnv (define, value);
+								
+							}
+							
+						case "JAVA_HOME":
+							
+							if (FileSystem.exists (value)) {
+								
+								Sys.putEnv (define, value);
 								
 							}
 						
 						default:
 							
-							Sys.putEnv (define, config.defines.get (define));
+							Sys.putEnv (define, value);
 						
 					}
 					
diff --git a/tools/helpers/AndroidHelper.hx b/tools/helpers/AndroidHelper.hx
index d073dbf36..c4f6aed3e 100644
--- a/tools/helpers/AndroidHelper.hx
+++ b/tools/helpers/AndroidHelper.hx
@@ -299,7 +299,7 @@ class AndroidHelper {
 			
 		} else {
 			
-			ProcessHelper.runCommand (adbPath, adbName, [ "devices" ], true, true);
+			output = ProcessHelper.runProcess (adbPath, adbName, [ "devices" ], true, true);
 			
 		}