diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index aa74aa4d18..c7e4a3e042 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -1,5 +1,5 @@
 Category:System
-License:GPLv2
+License:GPLv2+
 Web Site:http://diskusage.googlecode.com/
 Source Code:http://code.google.com/p/diskusage/source/checkout
 Issue Tracker:http://code.google.com/p/diskusage/issues/list
@@ -9,19 +9,17 @@ Description:
 Visually explore used and free space on internal and external storage.
 .
 
-Repo Type:svn
-Repo:http://diskusage.googlecode.com/svn/trunk/
+Repo Type:git
+Repo:https://code.google.com/p/diskusage/
 
-Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/
-#Note - version name/code is wrong in the repo - we replace it
-Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,forceversion=yes,forcevercode=yes
-Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.0alpha2,3001,!repo version incorrect,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.0alpha3,3005,!no source in repo,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.1,3010,68,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.2,3020,69,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:2.0.4,2004,d3c0dc5bafdb,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:2.0.5,2005,cb8e91528207,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:2.1.3,2103,296d3317a49d,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:3.1,3010,f97462007110,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:3.2,3020,dfcba57e1d92,prebuild=mkdir libs && cp extra/system.jar libs/
+Build Version:3.2.1,3021,1ac11c9696b6,prebuild=mkdir libs && cp extra/system.jar libs/,buildjni=yes
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
 Current Version:3.2.1
 Current Version Code:3021
 
diff --git a/metadata/com.jadn.cc.txt b/metadata/com.jadn.cc.txt
index 2a1497d24d..0370d75515 100644
--- a/metadata/com.jadn.cc.txt
+++ b/metadata/com.jadn.cc.txt
@@ -19,8 +19,9 @@ Repo Type:git
 Repo:git://github.com/bherrmann7/Car-Cast.git
 
 Build Version:1.0.129,129,7a879c6bfa51b5d80401b84e031bf4ff2981bb8c,subdir=cc,target=android-8,rm=cc/libs/admob-sdk-android.jar,patch=admob.patch
+Build Version:1.0.131,131,!patch no longer applies
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
 Current Version:1.0.131
 Current Version Code:131
 
diff --git a/metadata/com.smorgasbork.hotdeath.txt b/metadata/com.smorgasbork.hotdeath.txt
index b5771a8255..852e1948fb 100644
--- a/metadata/com.smorgasbork.hotdeath.txt
+++ b/metadata/com.smorgasbork.hotdeath.txt
@@ -9,12 +9,13 @@ Description:
 A variant of the classic card game Uno
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://hotdeath.googlecode.com/svn/trunk/
 
 Build Version:1.0.2,3,26
 Build Version:1.0.5,6,34
 Build Version:1.0.6,7,36
+Build Version:1.0.7,8,38
 
 Update Check Mode:Market
 Current Version:1.0.7
diff --git a/metadata/net.healeys.lexic.txt b/metadata/net.healeys.lexic.txt
index 8933983986..5a3f0b555d 100644
--- a/metadata/net.healeys.lexic.txt
+++ b/metadata/net.healeys.lexic.txt
@@ -14,7 +14,7 @@ Repo Type:hg
 Repo:https://code.google.com/p/lexic/
 
 Build Version:0.8.1,41,5ffa6d7ee6a4,target=android-8,subdir=trunk
-Build Version:0.8.1,41,!Market version code different but same version
+Build Version:0.8.1,42,!Market version code different but same version
 
 Update Check Mode:Market
 Current Version:0.8.1
diff --git a/metadata/net.szym.barnacle.txt b/metadata/net.szym.barnacle.txt
index 8218b08119..585a7f4b63 100644
--- a/metadata/net.szym.barnacle.txt
+++ b/metadata/net.szym.barnacle.txt
@@ -17,7 +17,7 @@ Repo:https://github.com/szym/barnacle.git
 
 Build Version:0.6.7 (evo),39,3a922c0260dea065b871b17127fa76d1bb21017c,buildjni=yes,fixtrans=yes,prebuild=sed -i 's@name="paypalUrl"@name="paypalUrl" formatted="false"@' res/values/strings.xml
 
-Update Check Mode:Market
-Current Version:0.6.7
-Current Version Code:40
+Update Check Mode:RepoManifest
+Current Version:0.6.7 (evo)
+Current Version Code:39
 
diff --git a/metadata/org.ametro.txt b/metadata/org.ametro.txt
index f2b3049b48..a67cf1fac9 100644
--- a/metadata/org.ametro.txt
+++ b/metadata/org.ametro.txt
@@ -1,5 +1,5 @@
 Category:Navigation
-License:GPLv3
+License:GPLv3+
 Web Site:http://www.ametro.org/
 Source Code:http://code.google.com/p/ametro/source/checkout
 Issue Tracker:http://code.google.com/p/ametro/issues/list
@@ -32,6 +32,7 @@ Find the nearest station next to user's location (for selected cities)
 Repo Type:git-svn
 Repo:http://ametro.googlecode.com/svn/trunk/
 
+Build Version:1.1.4,16,!Not sure which commit
 Build Version:1.1.5,17,489,subdir=workspace/aMetro
 
 Update Check Mode:Market