diff --git a/metadata/com.bottleworks.dailymoney.yml b/metadata/com.bottleworks.dailymoney.yml
index 589f323c22..6a0d785148 100644
--- a/metadata/com.bottleworks.dailymoney.yml
+++ b/metadata/com.bottleworks.dailymoney.yml
@@ -35,7 +35,7 @@ Builds:
 
 MaintainerNotes: Removed RepoURL as it is unclear which one it went to.
 
-ArchivePolicy: 0 versoins
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 0.9.8-121107-freshly
diff --git a/metadata/com.btcontract.wallet.yml b/metadata/com.btcontract.wallet.yml
index 19cdaea072..90484069fb 100644
--- a/metadata/com.btcontract.wallet.yml
+++ b/metadata/com.btcontract.wallet.yml
@@ -161,7 +161,7 @@ Builds:
       - popd
       - ./prepare_fdroid.sh
 
-ArchivePolicy: 0 versoins
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: '1.075'
diff --git a/metadata/com.chanapps.four.activity.yml b/metadata/com.chanapps.four.activity.yml
index c94d6105eb..db1ae30d8c 100644
--- a/metadata/com.chanapps.four.activity.yml
+++ b/metadata/com.chanapps.four.activity.yml
@@ -255,7 +255,7 @@ MaintainerNotes: |-
 
     https://github.com/grzegorznittner/chanu/issues/467 will fix some dependency issues.
 
-ArchivePolicy: 0 versoins
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 2.0.15
diff --git a/metadata/com.infonuascape.osrshelper.yml b/metadata/com.infonuascape.osrshelper.yml
index 9977ecba4f..e206567cfb 100644
--- a/metadata/com.infonuascape.osrshelper.yml
+++ b/metadata/com.infonuascape.osrshelper.yml
@@ -99,4 +99,5 @@ AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 3.0.4
 CurrentVersionCode: 49
+
 NoSourceSince: 1.6.2
diff --git a/metadata/com.jadn.cc.yml b/metadata/com.jadn.cc.yml
index 4151543053..0ddd945c1d 100644
--- a/metadata/com.jadn.cc.yml
+++ b/metadata/com.jadn.cc.yml
@@ -89,4 +89,5 @@ AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 1.0.173
 CurrentVersionCode: 173
+
 NoSourceSince: 1.0.173
diff --git a/metadata/com.jforce.chapelhillnextbus.yml b/metadata/com.jforce.chapelhillnextbus.yml
index 58df535825..d8093c0e58 100644
--- a/metadata/com.jforce.chapelhillnextbus.yml
+++ b/metadata/com.jforce.chapelhillnextbus.yml
@@ -38,4 +38,5 @@ AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: '1.1'
 CurrentVersionCode: 2
+
 NoSourceSince: '1.1'
diff --git a/metadata/com.liato.bankdroid.yml b/metadata/com.liato.bankdroid.yml
index bf2e393016..ecaf7fa0e3 100644
--- a/metadata/com.liato.bankdroid.yml
+++ b/metadata/com.liato.bankdroid.yml
@@ -440,4 +440,5 @@ AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 1.9.10.6
 CurrentVersionCode: 222
+
 NoSourceSince: 1.9.10.6
diff --git a/metadata/com.mattieapps.roommates.yml b/metadata/com.mattieapps.roommates.yml
index fc1d3f2b70..2b6dd76645 100644
--- a/metadata/com.mattieapps.roommates.yml
+++ b/metadata/com.mattieapps.roommates.yml
@@ -48,4 +48,5 @@ AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: '1.3'
 CurrentVersionCode: 9
+
 NoSourceSince: '1.3'
diff --git a/metadata/com.numix.icons_circle.yml b/metadata/com.numix.icons_circle.yml
index 39ce4b9b28..860c1a78ca 100644
--- a/metadata/com.numix.icons_circle.yml
+++ b/metadata/com.numix.icons_circle.yml
@@ -4,7 +4,7 @@ Categories:
   - Multimedia
 License: GPL-3.0-or-later
 WebSite: http://www.numixproject.org/
-SourceCode: https://github.com/numixproject/android-icon-suite/tree/master/com.numix.icons_circle
+SourceCode: https://github.com/numixproject/android-icon-suite
 IssueTracker: https://github.com/numixproject/android-icon-suite/issues
 
 AutoName: Numix Circle
diff --git a/metadata/org.projectvoodoo.screentestpatterns.yml b/metadata/org.projectvoodoo.screentestpatterns.yml
index f1f407dc67..a4802e3172 100644
--- a/metadata/org.projectvoodoo.screentestpatterns.yml
+++ b/metadata/org.projectvoodoo.screentestpatterns.yml
@@ -31,5 +31,5 @@ Builds:
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 3.4
+CurrentVersion: '3.4'
 CurrentVersionCode: 11
diff --git a/metadata/org.subsurface.yml b/metadata/org.subsurface.yml
index b6a53648ff..caeabb4646 100644
--- a/metadata/org.subsurface.yml
+++ b/metadata/org.subsurface.yml
@@ -32,6 +32,6 @@ Builds:
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: '1.7'
-CurrentVersionCode: 8w
+CurrentVersionCode: 8
 
 NoSourceSince: '1.7'
diff --git a/metadata/saschpe.poker.yml b/metadata/saschpe.poker.yml
index 3d70b51ebd..d77854180a 100644
--- a/metadata/saschpe.poker.yml
+++ b/metadata/saschpe.poker.yml
@@ -40,4 +40,4 @@ UpdateCheckMode: None
 CurrentVersion: 1.2.7
 CurrentVersionCode: 170127
 
-NoSourceSnice: 1.2.7
+NoSourceSince: 1.2.7