diff --git a/src/components/ContactForm.astro b/src/components/ContactForm.astro
index 869b126..1ec30d7 100644
--- a/src/components/ContactForm.astro
+++ b/src/components/ContactForm.astro
@@ -86,6 +86,7 @@ const { id: ID = "contact-form" } = Astro.props;
     const loadingIcon = form.querySelector(
       `#${CSS.escape(ID + "-loading-icon")}`
     );
+    if (!responseMsg || !button || !loadingIcon) return;
 
     form.addEventListener("submit", async function (event) {
       event.preventDefault();
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 0286d2d..33aa615 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -62,5 +62,6 @@ import TextLink from "@components/TextLink.astro";
 </footer>
 
 <script is:inline data-astro-rerun>
-  document.getElementById("footer-year").innerText = new Date().getFullYear();
+  const year = document.getElementById("footer-year");
+  if (year) year.innerText = new Date().getFullYear();
 </script>
diff --git a/src/components/SEO.astro b/src/components/SEO.astro
index 98abdbb..aadedd7 100644
--- a/src/components/SEO.astro
+++ b/src/components/SEO.astro
@@ -7,6 +7,7 @@ interface Props {
 }
 
 const { title, description, url = Astro.url, image } = Astro.props;
+const canonicalUrl = url.toString();
 
 import person from "@data/person";
 import site from "@data/site";
@@ -15,7 +16,7 @@ import { Schema } from "astro-seo-schema";
 ---
 
 <!-- SEO -->
-<link rel="canonical" href={url} />
+<link rel="canonical" href={canonicalUrl} />
 <meta name="robots" content="index, follow" />
 <Schema
   item={{
@@ -65,7 +66,7 @@ import { Schema } from "astro-seo-schema";
 <meta property="og:site_name" content={site.title} />
 <meta property="og:title" content={title} />
 <meta property="og:description" content={description} />
-<meta property="og:url" content={url} />
+<meta property="og:url" content={canonicalUrl} />
 <meta property="og:type" content="website" />
 <meta
   property="og:image"
diff --git a/src/components/TextLink.astro b/src/components/TextLink.astro
index 449aaa3..7552e24 100644
--- a/src/components/TextLink.astro
+++ b/src/components/TextLink.astro
@@ -28,7 +28,7 @@ const linkIsExternal: boolean =
   {...attrs}
   ><span class="group-hover:text-primary-600"><slot /></span>{
     includeExternalLinkIcon && linkIsExternal && (
-      <sup class="ml-0.5 inline-block">
+      <sup class="ml-0.5 inline-block" aria-hidden="true">
         <Icon
           name="mdi:external-link"
           class:list={[
diff --git a/src/pages/contact.astro b/src/pages/contact.astro
index f198ba0..8df7eb3 100644
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@@ -25,13 +25,17 @@ import { Icon } from "astro-icon/components";
         <SectionTitle>Other ways to reach me</SectionTitle>
         <div class="grid grid-cols-1 text-lg md:grid-cols-2">
           <div class="col-span-1 flex flex-col items-center justify-center p-4">
-            <Icon name="fa7-solid:at" class="text-4xl" />
+            <Icon name="fa7-solid:at" class="text-4xl" aria-hidden="true" />
             <TextLink href="mailto:nathan@nathancummins.com.au" class="mt-4"
               >nathan@nathancummins.com.au</TextLink
             >
           </div>
           <div class="col-span-1 flex flex-col items-center justify-center p-4">
-            <Icon name="fa7-solid:envelope" class="text-4xl" />
+            <Icon
+              name="fa7-solid:envelope"
+              class="text-4xl"
+              aria-hidden="true"
+            />
             <Paragraph class="my-0 mt-4"
               >PO Box 2112 Regency Park SA 5942</Paragraph
             >