diff --git a/metadata/com.asksven.betterwifionoff.txt b/metadata/com.asksven.betterwifionoff.txt
index 5926fba2b1..d145636666 100644
--- a/metadata/com.asksven.betterwifionoff.txt
+++ b/metadata/com.asksven.betterwifionoff.txt
@@ -1,3 +1,4 @@
+AntiFeatures:UpstreamNonFree
 Categories:System
 License:Apache2
 Web Site:http://asksven.tumblr.com
@@ -7,24 +8,20 @@ Issue Tracker:https://github.com/asksven/BetterWifiOnOff/issues
 Auto Name:Better Wifi on/off
 Summary:Manage the use of WiFi to save battery
 Description:
-Locale-API integration was removed to get it to buildZ
+Locale-API integration was removed to get it to build.
+Proprietary ad library was removed.
 .
 
 Repo Type:git
 Repo:https://github.com/asksven/BetterWifiOnOff.git
 
-#Generated by import.py - check this is the right version, and find the right commit!
 Build:2.1.0.0,43
     commit=v2.1.0.0
     subdir=BetterWifiOnOff
-    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1;MobAdMob@2d5736;Common-AskSven@b09bb8b6cd
+    rm=BetterWifiOnOff/libs/GoogleAdMobAdsSdk-6.4.1.jar;BetterWifiOnOff/src/com/asksven/betterwifionoff/localeplugin
+    srclibs=3:ActionBarSherlock@4.2.0;2:LocaleAPI@bc2d5a1;4:MobAdMob@2d5736;1:Common-AskSven@b09bb8b6cd
     prebuild=sed -i '95,97d;113,115d' AndroidManifest.xml && \
-        sed -i '24d' src/com/asksven/betterwifionoff/SsidWhitelistPreference.java && \
-        sed -i 's@\(reference.1=\).*@\1$$Common-AskSven$$@' project.properties && \
-        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties && \
-        sed -i 's@\(reference.3=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-        echo 'android.library.reference.4=$$MobAdMob$$' >> project.properties && \
-        rm -rf libs/Google*.jar  src/com/asksven/betterwifionoff/localeplugin
+        sed -i '24d' src/com/asksven/betterwifionoff/SsidWhitelistPreference.java
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.falconware.prestissimo.txt b/metadata/com.falconware.prestissimo.txt
index 259e69c4d3..7aba6a3dd1 100644
--- a/metadata/com.falconware.prestissimo.txt
+++ b/metadata/com.falconware.prestissimo.txt
@@ -18,7 +18,6 @@ Build:0.5,10
     commit=v0.5
     target=android-17
     srclibs=Sonic@637de
-    prebuild=sed -i '/INTERNET/d' AndroidManifest.xml
     build=$$NDK$$/ndk-build -C $$Sonic$$ && \
         mv $$Sonic$$/libs/armeabi* libs/
 
diff --git a/metadata/com.jaygoel.virginminuteschecker.txt b/metadata/com.jaygoel.virginminuteschecker.txt
index c37a1b708e..5b8eaf6f17 100644
--- a/metadata/com.jaygoel.virginminuteschecker.txt
+++ b/metadata/com.jaygoel.virginminuteschecker.txt
@@ -1,3 +1,4 @@
+AntiFeatures:UpstreamNonFree
 Category:Office
 License:NewBSD
 Web Site:https://github.com/poundifdef/VirginMobileMinutesChecker
@@ -13,10 +14,9 @@ Repo Type:git
 Repo:https://github.com/poundifdef/VirginMobileMinutesChecker.git
 
 Build Version:1.12,13,dc1d1c020c05f,\
-srclibs=MobAdMob@2d5736,\
+srclibs=1:MobAdMob@2d5736,\
 subdir=VirginMobileMinutesChecker,\
-rm=VirginMobileMinutesChecker/libs/GoogleAdMobAdsSdk-4.1.1.jar,\
-prebuild=cp -r $$MobAdMob$$/src/com/* src/com/
+rm=VirginMobileMinutesChecker/libs/GoogleAdMobAdsSdk-4.1.1.jar
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.taiste.lainari_en.txt b/metadata/com.taiste.lainari_en.txt
index 888f20b394..bf413fa275 100644
--- a/metadata/com.taiste.lainari_en.txt
+++ b/metadata/com.taiste.lainari_en.txt
@@ -1,4 +1,4 @@
-AntiFeatures:NonFreeUpstream
+AntiFeatures:UpstreamNonFree
 Category:Office
 License:GPLv3
 Web Site:https://github.com/helsinki-city-library/pocketlibrary/wiki
diff --git a/metadata/de.onyxbits.drudgery.txt b/metadata/de.onyxbits.drudgery.txt
index 0648320f2e..be2551e05c 100644
--- a/metadata/de.onyxbits.drudgery.txt
+++ b/metadata/de.onyxbits.drudgery.txt
@@ -11,6 +11,8 @@ Drudge Quest is a simple memory game the objective of which is to
 to get through the day while trying to avoid running into your boss as you 
 move from room to room along the 'Escher Hallway' of your company's office 
 building.
+
+The game is played via a homescreen or dashclock widget.
 .
 
 Repo Type:git
diff --git a/metadata/net.debian.debiandroid.txt b/metadata/net.debian.debiandroid.txt
index de14614178..68329497b4 100644
--- a/metadata/net.debian.debiandroid.txt
+++ b/metadata/net.debian.debiandroid.txt
@@ -23,6 +23,7 @@ Repo:https://github.com/uberspot/DebianDroid.git
 Build:1.7,12
     submodules=yes
     commit=a9eb950dd6f
+    prebuild=sed -i 's/StorageUtils/storageutils/g' project.properties
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest