diff --git a/uppsrc/ide/Builders/AndroidBuilder.icpp b/uppsrc/ide/Builders/AndroidBuilder.icpp
index 9083a61f9..845810f79 100644
--- a/uppsrc/ide/Builders/AndroidBuilder.icpp
+++ b/uppsrc/ide/Builders/AndroidBuilder.icpp
@@ -205,8 +205,9 @@ bool AndroidBuilder::BuildPackage(const String& package, Vector<String>& linkfil
 		for(int i = 0; i < pkg.flag.GetCount(); i++)
 			pkgMakeFile.AddCppFlag(pkg.flag[i].text);
 		
-		for(int i = 0; i < pkg.library.GetCount(); i++)
-			pkgMakeFile.AddLdLibrary(pkg.library[i].text);
+		Vector<String> libs = Split(Gather(pkg.library, config.GetKeys()), ' ');
+		for(int i = 0; i < libs.GetCount(); i++)
+			pkgMakeFile.AddLdLibrary(libs[i]);
 		
 		Vector<String> staticLibs = Split(Gather(pkg.static_library, config.GetKeys()), ' ');
 		for(int i = 0; i < staticLibs.GetCount(); i++)
diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp
index 421ecdd41..3b4d05c95 100644
--- a/uppsrc/ide/Methods.cpp
+++ b/uppsrc/ide/Methods.cpp
@@ -445,7 +445,9 @@ void BuildMethods::Load()
 		VectorMap<String, String> map;
 		String fn = ConfigFile(ff.GetName());
 		if(LoadVarFile(fn, map)) {
-			String builderName = map.Get("BUILDER");
+			int builderIdx = map.Find("BUILDER");
+			String builderName = builderIdx >= 0 ? map[builderIdx] : "";
+			
 			int setupIdx = -1;
 			String prefix;
 			for(int i = 0; i < setups.GetCount(); i++) {
@@ -646,8 +648,9 @@ VectorMap<String, String> BuildMethods::MapBuilderVars(const VectorMap<String, S
 {
 	VectorMap<String, String> mapedMap;
 	Index<String> varsToMaped;
-
-	String builder = map.Get("BUILDER");
+	
+	int builderIdx = map.Find("BUILDER");
+	String builder = builderIdx >= 0 ? map[builderIdx] : "";
 	if(builder.IsEmpty())
 		return VectorMap<String, String>();