diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..cf56876506
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: bugzilla
diff --git a/README.md b/README.md
index 778ef5053d..0ce49026a9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ For the full list of features, you can check the
 ## Demo
 
 You can try Bugzilla on the
-[test instance](https://harmony.bugzilla.ninja)
+[test instance](https://bugzilla-dev.allizom.org)
 
 ![Screengrab](images/bzgif.gif)
 
@@ -47,7 +47,7 @@ You can report bugs on the
 
 ## Community
 
-* [#bugzilla on librachat](irc://irc.libra.chat/bugzilla)
+* [#bugzilla on liberachat](irc://irc.libera.chat/bugzilla) [webchat](https://web.libera.chat/#bugzilla)
 * [Matrix](https://matrix.to/#/#bugzilla:mozilla.org)
 * [Twitter](https://twitter.com/bugzilla)
 * [Development Forum](https://www.mozilla.org/en-US/about/forums/#dev-apps-bugzilla)
diff --git a/extensions/FlagTypeComment/Extension.pm b/extensions/FlagTypeComment/Extension.pm
index e5892fcbe9..4a7e1bb117 100644
--- a/extensions/FlagTypeComment/Extension.pm
+++ b/extensions/FlagTypeComment/Extension.pm
@@ -72,7 +72,7 @@ sub _set_ftc_states {
   my $dbh = Bugzilla->dbh;
 
   my $ftc_flags;
-  my $db_result;
+  my $db_result = [];
   if ($file =~ /^admin\//) {
 
     # admin
@@ -121,11 +121,13 @@ sub _set_ftc_states {
 
     my $types = join(',', map { $_->id } @$flag_types);
     my $states = "'" . join("','", FLAGTYPE_COMMENT_STATES) . "'";
-    $db_result = $dbh->selectall_arrayref(
-      "SELECT type_id AS flagtype, on_status AS state, comment AS text
-               FROM flagtype_comments
-              WHERE type_id IN ($types) AND on_status IN ($states)", {Slice => {}}
-    );
+    if ($types) {
+      $db_result = $dbh->selectall_arrayref(
+        "SELECT type_id AS flagtype, on_status AS state, comment AS text
+                 FROM flagtype_comments
+                WHERE type_id IN ($types) AND on_status IN ($states)", {Slice => {}}
+      );
+    }
   }
 
   foreach my $row (@$db_result) {