diff --git a/metadata/com.nexes.manager.txt b/metadata/com.nexes.manager.txt
index c6fa7be153..d8a56029a8 100644
--- a/metadata/com.nexes.manager.txt
+++ b/metadata/com.nexes.manager.txt
@@ -18,8 +18,7 @@ Build Version:2.1.2,212,7bca6266be731085ac92
 Build Version:2.1.8,218,edf793a782861ae31648
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.1.8
 Current Version Code:218
 
diff --git a/metadata/com.qubling.sidekick.txt b/metadata/com.qubling.sidekick.txt
index 4dc82606dc..af1574df23 100644
--- a/metadata/com.qubling.sidekick.txt
+++ b/metadata/com.qubling.sidekick.txt
@@ -29,10 +29,7 @@ Build Version:0.5.0,15,b1a5d30c1a,target=android-13
 Build Version:0.5.1,16,v0.5.1-vc16-2013-04-07,target=android-13
 
 Auto Update Mode:None
-#version name in res/
-# Let's see if the dev remembers to use tags for future versions
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5.1
 Current Version Code:16
 
diff --git a/metadata/com.rhiannonweb.android.migrainetracker.txt b/metadata/com.rhiannonweb.android.migrainetracker.txt
index 489554440b..d175d3c239 100644
--- a/metadata/com.rhiannonweb.android.migrainetracker.txt
+++ b/metadata/com.rhiannonweb.android.migrainetracker.txt
@@ -20,8 +20,7 @@ Repo:http://hg.code.sf.net/p/migrainetracker/code
 Build Version:0.9b,2,ed91ba
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.9b
 Current Version Code:2
 
diff --git a/metadata/com.templaro.opsiz.aka.txt b/metadata/com.templaro.opsiz.aka.txt
index 126ae1836a..36e0425f2c 100644
--- a/metadata/com.templaro.opsiz.aka.txt
+++ b/metadata/com.templaro.opsiz.aka.txt
@@ -14,11 +14,10 @@ This project enables ham radio operators to use their android phones as memory k
 Repo Type:hg
 Repo:https://code.google.com/p/androidomatic-keyer
 
-Build Version:1.0,10,7266db,target=android-7
+Build Version:1.0,10,1.0,target=android-7
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:10
 
diff --git a/metadata/com.wanghaus.remembeer.txt b/metadata/com.wanghaus.remembeer.txt
index 7dd1634fa1..9d83257f2f 100644
--- a/metadata/com.wanghaus.remembeer.txt
+++ b/metadata/com.wanghaus.remembeer.txt
@@ -16,6 +16,8 @@ Anti-feature: Network Services. The
 Beer Cloud - online database to which the app connects for info -
 is neither free-as-in-freedom nor open-source, but that behaviour can
 be disabled in the settings
+
+Status: Source repo vanished
 .
 
 Repo Type:git
@@ -25,7 +27,6 @@ Build Version:1.2.2,48,c9d64e35964e9c445749aa02e470354b5788d8b4,target=android-4
 Build Version:1.3.0,50,319231627d207cf7fb1d2ac23ada0ffdd486230c,target=android-4,subdir=android,prebuild=mv lib libs
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.3.0
 Current Version Code:50
diff --git a/metadata/de.onyxbits.pocketbandit.txt b/metadata/de.onyxbits.pocketbandit.txt
index 1682c6200d..5bd41dca43 100644
--- a/metadata/de.onyxbits.pocketbandit.txt
+++ b/metadata/de.onyxbits.pocketbandit.txt
@@ -19,12 +19,21 @@ Pull the lever to spin the reels and push it up to stop them spinning.
 Repo Type:git
 Repo:https://github.com/onyxbits/pocketbandit.git
 
-Build Version:1.1,2,62dc5d59,extlibs=libgdx/libgdx-0.9.7.zip,prebuild=\
-rm -rf raw-data && unzip libs/libgdx-0.9.7.zip -d libs/ && rm libs/libgdx-0.9.7.zip
+Build:1.1,2
+    commit=62dc5d59
+    extlibs=libgdx/libgdx-0.9.7.zip
+    prebuild=rm -rf raw-data && \
+        unzip libs/libgdx-0.9.7.zip -d libs/ && \
+        rm libs/libgdx-0.9.7.zip
+
+Build:1.2,3
+    commit=d95e8a9aee7f
+	disable=use libgdx sensibly, test
+    extlibs=libgdx/libgdx-0.9.7.zip
+    rm=raw-data;custom_rules.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1
-Current Version Code:2
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3
 
diff --git a/metadata/edu.rit.poe.atomix.txt b/metadata/edu.rit.poe.atomix.txt
index a8b8c2c4a2..246e175097 100644
--- a/metadata/edu.rit.poe.atomix.txt
+++ b/metadata/edu.rit.poe.atomix.txt
@@ -18,8 +18,7 @@ Repo:https://droid-atomix.googlecode.com/hg/
 Build Version:1.0.1,2,ea2086d1f9fe759866008f6fe5187fc1cc97bd1d,target=android-4,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:2
 
diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt
index 1c7bc53706..cd72cf0cce 100644
--- a/metadata/eu.vranckaert.worktime.txt
+++ b/metadata/eu.vranckaert.worktime.txt
@@ -37,7 +37,6 @@ rm libs/google-analytics*
 
 Auto Update Mode:None
 # releases have their own branch
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.1.15
 Current Version Code:270