diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 632f64e..0c1120f 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -4,4 +4,4 @@
 <meta name="description" content="{{ .Description }}">
 <meta name="keywords" content="{{ range .Keywords }}{{ . }},{{ end }}">
 <meta name="author" content="{{ .Site.Title }}">
-{{ .Hugo.Generator }}
+{{ hugo.Generator }}
diff --git a/layouts/shortcodes/marginnote.html b/layouts/shortcodes/marginnote.html
index 4efb778..9de6d7b 100644
--- a/layouts/shortcodes/marginnote.html
+++ b/layouts/shortcodes/marginnote.html
@@ -1,3 +1,3 @@
-{{ $marginnoteDomIdSuffix := .Ordinal }}<label for="marginnote-{{.Page.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle">&#8853;</label>
-<input type="checkbox" id="marginnote-{{.Page.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
+{{ $marginnoteDomIdSuffix := .Ordinal }}<label for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle">&#8853;</label>
+<input type="checkbox" id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
 <span class="marginnote">{{ .Inner }}</span>
diff --git a/layouts/shortcodes/sidenote.html b/layouts/shortcodes/sidenote.html
index 96c63fc..22a9a66 100644
--- a/layouts/shortcodes/sidenote.html
+++ b/layouts/shortcodes/sidenote.html
@@ -1,3 +1,3 @@
-{{ $sidenoteDomIdSuffix := .Ordinal }}<label for="sidenote-{{.Page.UniqueID}}-{{ $sidenoteDomIdSuffix }}" class="margin-toggle sidenote-number"></label>
-<input type="checkbox" id="sidenote-{{.Page.UniqueID}}-{{ $sidenoteDomIdSuffix }}" class="margin-toggle"/>
+{{ $sidenoteDomIdSuffix := .Ordinal }}<label for="sidenote-{{.Page.File.UniqueID}}-{{ $sidenoteDomIdSuffix }}" class="margin-toggle sidenote-number"></label>
+<input type="checkbox" id="sidenote-{{.Page.File.UniqueID}}-{{ $sidenoteDomIdSuffix }}" class="margin-toggle"/>
 <span class="sidenote">{{ .Inner }}</span>