diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index 64edcdc289..e468fb3041 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -52,6 +52,7 @@ Build:3.4,3040
 
 Build:3.4.2,3042
     commit=23bce9d7fc7b
+    rm=jni/scan;assets/scan
     prebuild=mkdir libs && \
         cp extra/system.jar libs/
     buildjni=yes
diff --git a/metadata/org.openttd.sdl.txt b/metadata/org.openttd.sdl.txt
index 5d13488c4f..4389733c5d 100644
--- a/metadata/org.openttd.sdl.txt
+++ b/metadata/org.openttd.sdl.txt
@@ -3,6 +3,7 @@ License:GPLv2+
 Web Site:http://openttd.org/
 Source Code:https://github.com/pelya/commandergenius
 Issue Tracker:https://github.com/pelya/commandergenius/issues
+
 Name:OpenTTD
 Summary:Railway emulator
 Description:
@@ -13,29 +14,38 @@ extending it with new features.
 
 Repo Type:srclib
 Repo:libsdl-android
+
 # some libraries, such as libandroid.so can't be rebuilt from included sources;
 # others, such as python.so may be recompiled (probably, better from srclibs)
-Build Version:1.3.2.25,13225,openttd-1.3.2.25,subdir=project,submodules=yes,buildjni=no,target=android-17,\
-srclibs=OpenTTD@1.3.2,scanignore=project/jni/application/commandergenius/commandergenius/icotool,\
-init=\
-  ln -fs openttd jni/application/src && \
-  sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \
-  sed -ri 's/exit 0//' ../copyAssets.sh && \
-  find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \
-  rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \
-  cd ../.. && ./changeAppSettings.sh -a,\
-prebuild=\
-  mkdir -p jni/application/openttd/openttd-1.3.2 && \
-  cp -R $$OpenTTD$$/* jni/application/openttd/openttd-1.3.2 && \
-  cd jni/application/openttd/ && \
-  patch -p 0 -d openttd-1.3.2 < openttd-trunk-android.patch && \
-  patch -p 0 -d openttd-1.3.2 < findversion.sh.patch,\
-build=\
-  sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
-  cd .. && ./build.sh release
+Build:1.3.2.25,13225
+    commit=openttd-1.3.2.25
+    disable=Fails to clone source - Svndiff compressed data is invalid: Compression of svndiff data failed at /usr/share/perl5/Git/SVN/Ra.pm line 282
+    subdir=project
+    submodules=yes
+    init=ln -fs openttd jni/application/src && \
+        sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \
+        sed -ri 's/exit 0//' ../copyAssets.sh && \
+        find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
+        cd jni && \
+        rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \
+        cd ../.. && \
+        ./changeAppSettings.sh -a
+    target=android-17
+    srclibs=OpenTTD@1.3.2
+    prebuild=mkdir -p jni/application/openttd/openttd-1.3.2 && \
+        cp -R $$OpenTTD$$/* jni/application/openttd/openttd-1.3.2 && \
+        cd jni/application/openttd/ && \
+        patch -p 0 -d openttd-1.3.2 < openttd-trunk-android.patch && \
+        patch -p 0 -d openttd-1.3.2 < findversion.sh.patch
+    scanignore=project/jni/application/commandergenius/commandergenius/icotool
+    build=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
+        cd .. && \
+        ./build.sh release
+    buildjni=no
 
 # todo
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:1.3.2.25
 Current Version Code:13225
+
diff --git a/metadata/org.projectmaxs.main.txt b/metadata/org.projectmaxs.main.txt
index 20dedc679e..d262f78ab0 100644
--- a/metadata/org.projectmaxs.main.txt
+++ b/metadata/org.projectmaxs.main.txt
@@ -42,13 +42,12 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=main
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=main
     prebuild=make prebuild
diff --git a/metadata/org.projectmaxs.module.bluetooth.txt b/metadata/org.projectmaxs.module.bluetooth.txt
index 23996022ce..2cb196bf3a 100644
--- a/metadata/org.projectmaxs.module.bluetooth.txt
+++ b/metadata/org.projectmaxs.module.bluetooth.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-bluetooth
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-bluetooth
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.bluetoothadmin.txt b/metadata/org.projectmaxs.module.bluetoothadmin.txt
index 24a9ea3354..64461ebab5 100644
--- a/metadata/org.projectmaxs.module.bluetoothadmin.txt
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-bluetoothadmin
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-bluetoothadmin
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.clipboard.txt b/metadata/org.projectmaxs.module.clipboard.txt
index 733eaf2400..c3f3909ca3 100644
--- a/metadata/org.projectmaxs.module.clipboard.txt
+++ b/metadata/org.projectmaxs.module.clipboard.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-clipboard
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-clipboard
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.contactsread.txt b/metadata/org.projectmaxs.module.contactsread.txt
index c4f1d9e0d1..5c91346ae6 100644
--- a/metadata/org.projectmaxs.module.contactsread.txt
+++ b/metadata/org.projectmaxs.module.contactsread.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-contactsread
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-contactsread
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.fileread.txt b/metadata/org.projectmaxs.module.fileread.txt
index e3843d2404..1bf5cb5a61 100644
--- a/metadata/org.projectmaxs.module.fileread.txt
+++ b/metadata/org.projectmaxs.module.fileread.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-fileread
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-fileread
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.filewrite.txt b/metadata/org.projectmaxs.module.filewrite.txt
index 72defaa6ee..117170ac7a 100644
--- a/metadata/org.projectmaxs.module.filewrite.txt
+++ b/metadata/org.projectmaxs.module.filewrite.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-filewrite
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-filewrite
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.phonestateread.txt b/metadata/org.projectmaxs.module.phonestateread.txt
index 989a6c32eb..eb9e53b5f3 100644
--- a/metadata/org.projectmaxs.module.phonestateread.txt
+++ b/metadata/org.projectmaxs.module.phonestateread.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-phonestateread
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-phonestateread
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.ringermode.txt b/metadata/org.projectmaxs.module.ringermode.txt
index 1af152ea30..d4242642f7 100644
--- a/metadata/org.projectmaxs.module.ringermode.txt
+++ b/metadata/org.projectmaxs.module.ringermode.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-ringermode
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-ringermode
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.smsnotify.txt b/metadata/org.projectmaxs.module.smsnotify.txt
index b7ec544d0a..9638d51d57 100644
--- a/metadata/org.projectmaxs.module.smsnotify.txt
+++ b/metadata/org.projectmaxs.module.smsnotify.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-smsnotify
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-smsnotify
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.smsread.txt b/metadata/org.projectmaxs.module.smsread.txt
index 77c9ba3e8e..5e224b1030 100644
--- a/metadata/org.projectmaxs.module.smsread.txt
+++ b/metadata/org.projectmaxs.module.smsread.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-smsread
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-smsread
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.smssend.txt b/metadata/org.projectmaxs.module.smssend.txt
index d9460ef069..440a167a7f 100644
--- a/metadata/org.projectmaxs.module.smssend.txt
+++ b/metadata/org.projectmaxs.module.smssend.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-smssend
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-smssend
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.module.smswrite.txt b/metadata/org.projectmaxs.module.smswrite.txt
index 92b23f1162..ad20857821 100644
--- a/metadata/org.projectmaxs.module.smswrite.txt
+++ b/metadata/org.projectmaxs.module.smswrite.txt
@@ -45,7 +45,7 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=module-smswrite
     init=cd .. && \
@@ -53,7 +53,6 @@ Build:0.0.1.4,5
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=module-smswrite
     init=cd .. && \
diff --git a/metadata/org.projectmaxs.transport.xmpp.txt b/metadata/org.projectmaxs.transport.xmpp.txt
index 8e9f43635a..9de2ba25b6 100644
--- a/metadata/org.projectmaxs.transport.xmpp.txt
+++ b/metadata/org.projectmaxs.transport.xmpp.txt
@@ -38,13 +38,12 @@ Build:0.0.1.3,4
     prebuild=make prebuild
 
 Build:0.0.1.4,5
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
     commit=0.0.1.4
     subdir=transport-xmpp
     prebuild=make prebuild
 
 Build:0.0.1.5,6
-    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
     commit=0.0.1.5
     subdir=transport-xmpp
     prebuild=make prebuild
diff --git a/metadata/org.sufficientlysecure.standalonecalendar.txt b/metadata/org.sufficientlysecure.standalonecalendar.txt
index 0aea90d1e6..5ef1cecea3 100644
--- a/metadata/org.sufficientlysecure.standalonecalendar.txt
+++ b/metadata/org.sufficientlysecure.standalonecalendar.txt
@@ -16,8 +16,8 @@ Repo Type:git
 Repo:https://github.com/dschuermann/standalone-calendar.git
 
 Build:standalone-1.2,3
-    disable=library project issues
     commit=standalone-1.2
+    submodules=yes
     gradle=yes
 
 Auto Update Mode:None