diff --git a/metadata/org.bombusmod.yml b/metadata/org.bombusmod.yml
index 9eb95b2862..d5f4200246 100644
--- a/metadata/org.bombusmod.yml
+++ b/metadata/org.bombusmod.yml
@@ -1,7 +1,6 @@
 Categories:
   - Internet
 License: GPL-2.0-only
-WebSite: http://bombusmod.net.ru
 SourceCode: https://github.com/BombusMod/BombusMod
 IssueTracker: https://github.com/BombusMod/BombusMod/issues
 
diff --git a/metadata/org.bottiger.podcast.yml b/metadata/org.bottiger.podcast.yml
index 5c100ff465..f890bfeb27 100644
--- a/metadata/org.bottiger.podcast.yml
+++ b/metadata/org.bottiger.podcast.yml
@@ -1,6 +1,7 @@
 Categories:
   - Multimedia
 License: GPL-3.0-only
+AuthorName: Arvid Böttiger
 SourceCode: https://github.com/bottiger/SoundWaves
 IssueTracker: https://github.com/bottiger/SoundWaves/issues
 Translation: https://www.transifex.com/projects/p/soundwaves/
diff --git a/metadata/org.c_base.c_beam.yml b/metadata/org.c_base.c_beam.yml
index cf89566152..2cbc24c455 100644
--- a/metadata/org.c_base.c_beam.yml
+++ b/metadata/org.c_base.c_beam.yml
@@ -1,6 +1,8 @@
 Categories:
   - Science & Education
 License: WTFPL
+AuthorName: c-base
+AuthorWebSite: https://c-base.org/
 SourceCode: https://github.com/c-base/c-beam-droid
 IssueTracker: https://github.com/c-base/c-beam-droid/issues
 Changelog: https://github.com/c-base/c-beam-droid/releases
diff --git a/metadata/org.catrobat.paintroid.yml b/metadata/org.catrobat.paintroid.yml
index cd7dcdb179..d57fa4a4e4 100644
--- a/metadata/org.catrobat.paintroid.yml
+++ b/metadata/org.catrobat.paintroid.yml
@@ -1,7 +1,9 @@
 Categories:
   - Graphics
 License: AGPL-3.0-or-later
-WebSite: https://www.catrobat.org
+AuthorName: Catrobat
+AuthorEmail: contact@catrobat.org
+AuthorWebSite: https://www.catrobat.org
 SourceCode: https://github.com/Catrobat/Paintroid
 IssueTracker: https://jira.catrob.at/projects/PAINTROID/issues
 Changelog: https://github.com/Catrobat/Paintroid/releases
diff --git a/metadata/org.chorem.android.saymytexts.yml b/metadata/org.chorem.android.saymytexts.yml
index 04c91d1a0c..182d3b715d 100644
--- a/metadata/org.chorem.android.saymytexts.yml
+++ b/metadata/org.chorem.android.saymytexts.yml
@@ -1,9 +1,8 @@
 Categories:
   - Phone & SMS
 License: GPL-3.0-only
-WebSite: https://doc.chorem.org/say-my-texts
-SourceCode: http://forge.chorem.org/projects/say-my-texts/repository
-IssueTracker: http://forge.chorem.org/projects/say-my-texts/issues
+SourceCode: https://gitlab.nuiton.org/chorem/say-my-texts/tree/develop
+IssueTracker: https://gitlab.nuiton.org/chorem/say-my-texts/issues
 
 AutoName: Say My Texts
 Description: |-
@@ -44,5 +43,3 @@ AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 2.1.1
 CurrentVersionCode: 7
-
-NoSourceSince: 2.1.1
diff --git a/metadata/org.chrisbailey.todo.yml b/metadata/org.chrisbailey.todo.yml
index b39c27b690..ac85101716 100644
--- a/metadata/org.chrisbailey.todo.yml
+++ b/metadata/org.chrisbailey.todo.yml
@@ -1,6 +1,7 @@
 Categories:
   - Theming
 License: GPL-3.0-only
+AuthorName: Chris Bailey
 SourceCode: https://github.com/chrispbailey/ToDo-List-Widget
 IssueTracker: https://github.com/chrispbailey/ToDo-List-Widget/issues
 
diff --git a/metadata/org.ciasaboark.tacere.yml b/metadata/org.ciasaboark.tacere.yml
index cb8b123df4..81984d9578 100644
--- a/metadata/org.ciasaboark.tacere.yml
+++ b/metadata/org.ciasaboark.tacere.yml
@@ -1,6 +1,8 @@
 Categories:
   - Time
 License: BSD-3-Clause
+AuthorName: Jonathan Nelson
+AuthorEmail: ciasaboark@gmail.com
 SourceCode: https://github.com/ciasaboark/Tacere
 IssueTracker: https://github.com/ciasaboark/Tacere/issues
 Changelog: https://github.com/ciasaboark/Tacere/releases
diff --git a/metadata/org.cipherdyne.fwknop2.yml b/metadata/org.cipherdyne.fwknop2.yml
index f3f1510758..b5aa30e3f7 100644
--- a/metadata/org.cipherdyne.fwknop2.yml
+++ b/metadata/org.cipherdyne.fwknop2.yml
@@ -1,6 +1,8 @@
 Categories:
   - Internet
 License: GPL-2.0-or-later
+AuthorName: Jonathan Bennett
+AuthorEmail: JBennett@incomsystems.biz
 WebSite: https://www.cipherdyne.org/
 SourceCode: https://github.com/jp-bennett/fwknop2
 IssueTracker: https://github.com/jp-bennett/fwknop2/issues
diff --git a/metadata/org.congresointeractivo.elegilegi.yml b/metadata/org.congresointeractivo.elegilegi.yml
index d1a5ff0e91..20ae610252 100644
--- a/metadata/org.congresointeractivo.elegilegi.yml
+++ b/metadata/org.congresointeractivo.elegilegi.yml
@@ -1,6 +1,8 @@
 Categories:
   - Games
 License: GPL-3.0-only
+AuthorName: Congreso Interactivo
+AuthorWebSite: http://www.congresointeractivo.org/
 SourceCode: https://github.com/congresointeractivo/elegilegimobile
 IssueTracker: https://github.com/congresointeractivo/elegilegimobile/issues
 
diff --git a/metadata/org.connectbot.yml b/metadata/org.connectbot.yml
index 81328efdc2..c44353baba 100644
--- a/metadata/org.connectbot.yml
+++ b/metadata/org.connectbot.yml
@@ -1,6 +1,8 @@
 Categories:
   - Internet
 License: Apache-2.0
+AuthorName: ConnectBot
+AuthorEmail: developers@connectbot.org
 WebSite: http://connectbot.org
 SourceCode: https://github.com/connectbot/connectbot
 IssueTracker: https://github.com/connectbot/connectbot/issues
@@ -21,7 +23,7 @@ Repo: https://github.com/connectbot/connectbot.git
 Builds:
   - versionName: 1.7.1
     versionCode: 323
-    disable: from 2010, doesn't build since NDK r8
+    disable: from 2010, doesn’t build since NDK r8
     commit: v1.7.1
 
   - versionName: 22-46-35-snapshot