diff --git a/project/include/system/Mutex.h b/project/include/system/Mutex.h
index 289ede933c..7a5066e9bf 100644
--- a/project/include/system/Mutex.h
+++ b/project/include/system/Mutex.h
@@ -13,9 +13,9 @@ namespace lime {
 			Mutex ();
 			~Mutex ();
 
-			bool Lock ();
-			bool TryLock ();
-			bool Unlock ();
+			bool Lock () const;
+			bool TryLock () const;
+			bool Unlock () const;
 
 		private:
 
@@ -28,4 +28,4 @@ namespace lime {
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/project/src/backend/sdl/SDLMutex.cpp b/project/src/backend/sdl/SDLMutex.cpp
index e0fc07aefb..86912fa6d7 100644
--- a/project/src/backend/sdl/SDLMutex.cpp
+++ b/project/src/backend/sdl/SDLMutex.cpp
@@ -23,7 +23,7 @@ namespace lime {
 	}
 
 
-	bool Mutex::Lock () {
+	bool Mutex::Lock () const {
 
 		if (mutex) {
 
@@ -36,7 +36,7 @@ namespace lime {
 	}
 
 
-	bool Mutex::TryLock () {
+	bool Mutex::TryLock () const {
 
 		if (mutex) {
 
@@ -49,7 +49,7 @@ namespace lime {
 	}
 
 
-	bool Mutex::Unlock () {
+	bool Mutex::Unlock () const {
 
 		if (mutex) {
 
@@ -62,4 +62,4 @@ namespace lime {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/src/lime/utils/AssetLibrary.hx b/src/lime/utils/AssetLibrary.hx
index b368f7954f..782bd4a433 100644
--- a/src/lime/utils/AssetLibrary.hx
+++ b/src/lime/utils/AssetLibrary.hx
@@ -200,7 +200,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return AudioBuffer.fromFile(paths.get(id));
+			return AudioBuffer.fromFile(getPath(id));
 		}
 	}
 
@@ -239,7 +239,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return Bytes.fromFile(paths.get(id));
+			return Bytes.fromFile(getPath(id));
 		}
 	}
 
@@ -263,7 +263,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return Font.fromFile(paths.get(id));
+			return Font.fromFile(getPath(id));
 		}
 	}
 
@@ -283,7 +283,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return Image.fromFile(paths.get(id));
+			return Image.fromFile(getPath(id));
 		}
 	}
 
@@ -498,7 +498,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return Bytes.loadFromFile(paths.get(id));
+			return Bytes.loadFromFile(getPath(id));
 		}
 	}
 
@@ -521,9 +521,9 @@ class AssetLibrary
 		else
 		{
 			#if (js && html5)
-			return Font.loadFromName(paths.get(id));
+			return Font.loadFromName(getPath(id));
 			#else
-			return Font.loadFromFile(paths.get(id));
+			return Font.loadFromFile(getPath(id));
 			#end
 		}
 	}
@@ -579,7 +579,7 @@ class AssetLibrary
 		}
 		else
 		{
-			return Image.loadFromFile(paths.get(id));
+			return Image.loadFromFile(getPath(id));
 		}
 	}
 
@@ -607,7 +607,7 @@ class AssetLibrary
 		else
 		{
 			var request = new HTTPRequest<String>();
-			return request.load(paths.get(id));
+			return request.load(getPath(id));
 		}
 	}
 
diff --git a/src/lime/utils/PackedAssetLibrary.hx b/src/lime/utils/PackedAssetLibrary.hx
index dd976c22e9..f99b0df82a 100644
--- a/src/lime/utils/PackedAssetLibrary.hx
+++ b/src/lime/utils/PackedAssetLibrary.hx
@@ -242,7 +242,7 @@ import flash.media.Sound;
 			else
 			{
 				var basePath = rootPath == null || rootPath == "" ?  "" : Path.addTrailingSlash(rootPath);
-				var libPath = paths.exists(id) ? paths.get(id) : id;
+				var libPath = paths.exists(id) ? getPath(id) : id;
 
 				var path = Path.join([basePath, libPath]);
 				path = __cacheBreak(path);
diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx
index 9372437ee2..56fa6aeae0 100644
--- a/tools/platforms/AndroidPlatform.hx
+++ b/tools/platforms/AndroidPlatform.hx
@@ -145,11 +145,20 @@ class AndroidPlatform extends PlatformTarget
 		var architectures = [];
 
 		if (hasARMV5) architectures.push(Architecture.ARMV5);
-		if (hasARMV7 || (!hasARMV5 && !hasX86)) architectures.push(Architecture.ARMV7);
+		if (hasARMV7) architectures.push(Architecture.ARMV7);
 		if (hasARM64) architectures.push(Architecture.ARM64);
 		if (hasX86) architectures.push(Architecture.X86);
 		if (hasX64) architectures.push(Architecture.X64);
 
+		if (architectures.length == 0)
+		{
+			Log.warn("No architecture selected, defaulting to ARM64.");
+
+			hasARM64 = true;
+
+			architectures.push(Architecture.ARM64);
+		}
+
 		for (architecture in architectures)
 		{
 			var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];
diff --git a/tools/platforms/IOSPlatform.hx b/tools/platforms/IOSPlatform.hx
index 8a8736a4f2..9d5fa33463 100644
--- a/tools/platforms/IOSPlatform.hx
+++ b/tools/platforms/IOSPlatform.hx
@@ -475,8 +475,7 @@ class IOSPlatform extends PlatformTarget
 	public override function rebuild():Void
 	{
 		var armv6 = (project.architectures.indexOf(Architecture.ARMV6) > -1 && !project.targetFlags.exists("simulator"));
-		var armv7 = (command == "rebuild"
-			|| (project.architectures.indexOf(Architecture.ARMV7) > -1 && !project.targetFlags.exists("simulator")));
+		var armv7 = (project.architectures.indexOf(Architecture.ARMV7) > -1 && !project.targetFlags.exists("simulator"));
 		var armv7s = (project.architectures.indexOf(Architecture.ARMV7S) > -1 && !project.targetFlags.exists("simulator"));
 		var arm64 = (command == "rebuild"
 			|| (project.architectures.indexOf(Architecture.ARM64) > -1 && !project.targetFlags.exists("simulator")));