diff --git a/tools/helpers/AndroidHelper.hx b/tools/helpers/AndroidHelper.hx
index 7a5ff6bce..e6986db66 100644
--- a/tools/helpers/AndroidHelper.hx
+++ b/tools/helpers/AndroidHelper.hx
@@ -81,7 +81,8 @@ class AndroidHelper {
 	
 	public static function getDeviceSDKVersion (deviceID:String):Int {
 		
-		ProcessHelper.runCommand (adbPath, adbName, [ "devices" ]);
+		ProcessHelper.runCommand (adbPath, adbName, [ "kill-server" ]);
+		ProcessHelper.runCommand (adbPath, adbName, [ "start-server" ]);
 		
 		var args = [ "shell" ];
 		
diff --git a/tools/project/HXProject.hx b/tools/project/HXProject.hx
index 57e5b6132..87712e123 100644
--- a/tools/project/HXProject.hx
+++ b/tools/project/HXProject.hx
@@ -129,7 +129,7 @@ class HXProject {
 				platformType = PlatformType.WEB;
 				architectures = [];
 				
-			case HTML5, EMSCRIPTEN:
+			case HTML5, FIREFOX, EMSCRIPTEN:
 				
 				platformType = PlatformType.WEB;
 				architectures = [];
@@ -137,15 +137,6 @@ class HXProject {
 				defaultWindow.width = 0;
 				defaultWindow.height = 0;
 				defaultWindow.fps = 0;
-			
-			case FIREFOX:
-				
-				platformType = PlatformType.MOBILE;
-				architectures = [];
-				
-				defaultWindow.width = 0;
-				defaultWindow.height = 0;
-				defaultWindow.fps = 0;
 				
 			case ANDROID, BLACKBERRY, IOS, TIZEN, WEBOS:
 				
@@ -901,7 +892,7 @@ class HXProject {
 				
 				if (asset.embed == null) {
 					
-					embeddedAsset.embed = (platformType == PlatformType.WEB || target == Platform.FIREFOX);
+					embeddedAsset.embed = (platformType == PlatformType.WEB);
 					
 				}