diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index 81d362fd02..17eb463ccc 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -22,19 +22,17 @@ releases. Until then, you can find apks on the project's website.
 Repo Type:git
 Repo:git://git.linphone.org/linphone-android.git
 
-#Build Version:2.0.3-fdroid,2003,!syntax error on build server 2.0.3-1,submodules=no,update=no,\
-Build Version:2.0.3-fdroid,2003,2.0.3-1,submodules=no,update=no,\
-init=git submodule update --init --recursive,prebuild=rm -rf tests && \
-rm -f submodules/externals/webrtc/modules/\
+Build Version:2.0.3-fdroid,2003,2.0.3-1,submodules=no,\
+init=git submodule update --init --recursive,prebuild=\
+rm -rf tests submodules/externals/webrtc/modules/\
 video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$ && \
-sed -i 's@\$(NDK_PATH)@$$NDK$$@g' Makefile && \
 echo "version.name=2.0.3-fdroid" > default.properties && \
 sed -i 's/debuggable ="true"/debuggable="false"/g' AndroidManifest.xml && \
+sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile && \
 sed -i 's/markets\">true/markets\">=false/g' \
 res/values/non_localizable_custom.xml,build=\
 make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 \
-BUILD_FOR_X86=0 update-project prepare-sources,buildjni=no
+BUILD_FOR_X86=1 prepare-sources,buildjni=no
 
 Auto Update Mode:None
 #Tags would nuke all the submodules
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
index 69d3ea55f0..664068fb59 100644
--- a/metadata/paulscode.android.mupen64plusae.txt
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -29,7 +29,7 @@ Repo:https://github.com/paulscode/mupen64plus-ae.git
 Build Version:2.0.0,16,2.0.0,rm=libs/ouya-sdk.jar,buildjni=yes
 Build Version:2.1.1,21,2.1.1,rm=libs/ouya-sdk.jar,buildjni=yes
 Build Version:2.1.3,23,2.1.3,rm=libs/ouya-sdk.jar,buildjni=yes
-Build Version:2.2.1,25,2.2.1,rm=libs/ouya-sdk.jar,buildjni=yes,forceversion=yes
+Build Version:2.2.1,25,!ndk-build errors (at 2.2.1),rm=libs/ouya-sdk.jar,buildjni=yes
 
 Auto Update Mode:None
 # In market under different name