diff --git a/website/src/community/contact-us.md b/website/src/community/contact-us.md
index 60e4d40705ea..1ae5a709f060 100644
--- a/website/src/community/contact-us.md
+++ b/website/src/community/contact-us.md
@@ -29,14 +29,14 @@ whichever one seems best!
 
 | How to contact us | When to use it |
 | ----------------- | ---------------|
-| [user@](https://lists.apache.org/list.html?user@beam.apache.org) mailing list | User support and questions ([Subscribe user-subscribe@beam.apache.org](mailto:user-subscribe@beam.apache.org), [Unsubscribe user-unsubscribe@beam.apache.org](mailto:user-unsubscribe@beam.apache.org)) |
-| [dev@](https://lists.apache.org/list.html?dev@beam.apache.org) mailing list | Development discussions ([Subscribe ev-subscribe@beam.apache.org](mailto:dev-subscribe@beam.apache.org), [Unsubscribe dev-unsubscribe@beam.apache.org](mailto:dev-unsubscribe@beam.apache.org)) |
-| [commits@](https://lists.apache.org/list.html?commits@beam.apache.org) mailing list | Firehose of commits, bugs, pull requests, etc. ([Subscribe commits-subscribe@beam.apache.org](mailto:commits-subscribe@beam.apache.org), [Unsubscribe commits-unsubscribe@beam.apache.org](mailto:commits-unsubscribe@beam.apache.org)) |
+| [user@](https://lists.apache.org/list.html?user@beam.apache.org) mailing list | User support and questions ([Subscribe](mailto:user-subscribe@beam.apache.org)[^1], [Unsubscribe](mailto:user-unsubscribe@beam.apache.org)[^1], [Archives](https://lists.apache.org/list.html?user@beam.apache.org)) |
+| [dev@](https://lists.apache.org/list.html?dev@beam.apache.org) mailing list | Development discussions ([Subscribe](mailto:dev-subscribe@beam.apache.org)[^1], [Unsubscribe](mailto:dev-unsubscribe@beam.apache.org)[^1], [Archives](https://lists.apache.org/list.html?dev@beam.apache.org)) |
+| [commits@](https://lists.apache.org/list.html?commits@beam.apache.org)[^1] mailing list | Firehose of commits, bugs, pull requests, etc. ([Subscribe](mailto:commits-subscribe@beam.apache.org)[^1], [Unsubscribe](mailto:commits-unsubscribe@beam.apache.org)[^1], [Archives](https://lists.apache.org/list.html?commits@beam.apache.org)) |
 | [JIRA bug tracker](https://issues.apache.org/jira/browse/BEAM) | Report bugs / discover known issues |
 | [StackOverflow](http://stackoverflow.com/questions/tagged/apache-beam) | Ask and answer user support questions |
 | [Slack](https://s.apache.org/beam-slack-channel) | Chat with users and developers on channel #beam ([Join](https://s.apache.org/slack-invite)) |
 {:.table}
 
-To subscribe or unsubscribe, a blank email is fine.
+[^1]: To subscribe or unsubscribe, a blank email is fine.
 
 If you wish to report a security vulnerability, please contact [security@apache.org](mailto:security@apache.org). Apache Beam follows the typical [Apache vulnerability handling process](https://apache.org/security/committers.html#vulnerability-handling).
diff --git a/website/src/contribute/FAQ.md b/website/src/contribute/FAQ.md
index 4345e705befd..883dd4981abf 100644
--- a/website/src/contribute/FAQ.md
+++ b/website/src/contribute/FAQ.md
@@ -22,7 +22,7 @@ limitations under the License.
 
 Frequently asked questions about contributing to Apache Beam.
 
-<!-- TODO(BEAM-5737): Move this to confluence wiki
+<!-- TODO(BEAM-5737): Move this to confluence wiki -->
 
 ### Who do I ask if I am stuck?