diff --git a/src/layouts/_default/home.html b/src/layouts/_default/home.html
index c1ee6ba59..b27e64b80 100644
--- a/src/layouts/_default/home.html
+++ b/src/layouts/_default/home.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
 <div class="posts-container mx-auto my-5">
   <div class="posts">
-    {{ $paginator := .Paginate (where site.RegularPages "Type" "posts") }}
+    {{ $paginator := .Paginate (where site.RegularPages "Type" "posts") -}}
     {{- range $i, $page := $paginator.Pages -}}
       {{- /* Don't lazyload the first video in each page */ -}}
       {{- $lazyload := cond (eq $i 0) false true -}}
diff --git a/src/layouts/_default/videos.html b/src/layouts/_default/videos.html
index 9aff332b2..79b21b8ec 100644
--- a/src/layouts/_default/videos.html
+++ b/src/layouts/_default/videos.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 {{ $postsWithVideos := where (where site.RegularPages "Type" "posts") ".Params.video" "!=" nil -}}
-{{- range $index, $post := $postsWithVideos }}
+{{- range $index, $post := $postsWithVideos -}}
   {{- if eq $index 0 -}}
   <div class="row my-5">
   {{- end }}
diff --git a/src/layouts/partials/social.html b/src/layouts/partials/social.html
index db161712f..6001c300f 100644
--- a/src/layouts/partials/social.html
+++ b/src/layouts/partials/social.html
@@ -13,8 +13,10 @@
 <meta name="twitter:creator" content="@{{ $author_twitter | default .Site.Params.twitter }}">
 
 {{ template "_internal/opengraph.html" . -}}
+
 {{- /* Manually add `og:image`'s dimensions since Hugo's internal shortcode doesn't do it */ -}}
-{{ with (imageConfig (path.Join "src/static" (index $.Site.Params.images 0))) -}}
+{{- $socialImage := path.Join "src/static" (index $.Site.Params.images 0) -}}
+{{- with imageConfig $socialImage -}}
 <meta property="og:image:width" content="{{ .Width }}">
 <meta property="og:image:height" content="{{ .Height }}">
 {{- end }}
diff --git a/src/layouts/partials/video.html b/src/layouts/partials/video.html
index b1a053e4d..0f1527d6d 100644
--- a/src/layouts/partials/video.html
+++ b/src/layouts/partials/video.html
@@ -5,5 +5,12 @@
 {{- $video_start := .context.Params.video_start -}}
 
 <div class="ratio ratio-16x9">
-  <iframe {{ if eq $lazyload true }}class="lazy" data-src{{ else }}src{{ end }}="https://www.youtube-nocookie.com/embed/{{ $video }}?rel=0{{ with $video_start }}&amp;start={{ . }}{{ end }}" title="YouTube Video" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" width="760" height="570" allowfullscreen></iframe>
+  <iframe
+    {{ if eq $lazyload true }}class="lazy" data-src{{ else }}src{{ end }}="https://www.youtube-nocookie.com/embed/{{ $video }}?rel=0{{ with $video_start }}&amp;start={{ . }}{{ end }}"
+    allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+    allowfullscreen
+    title="YouTube Video"
+    width="760"
+    height="570">
+  </iframe>
 </div>