diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml
index 8dd70da7a..831681511 100644
--- a/layouts/_default/sitemap.xml
+++ b/layouts/_default/sitemap.xml
@@ -1,7 +1,7 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  {{ range .Site.AllPages }}
+  {{ range site.AllPages }}
   {{- if and (not .Params.sitemap_exclude) (not .Draft) }}
   <url>
     <loc>{{ .Permalink }}</loc>
diff --git a/layouts/partials/feature-info.html b/layouts/partials/feature-info.html
index 97be0ec00..d0636a6a7 100644
--- a/layouts/partials/feature-info.html
+++ b/layouts/partials/feature-info.html
@@ -1,5 +1,5 @@
 {{ $currentPage := .Page.Permalink }}
-{{ $features := .Site.Data.feature_data }}
+{{ $features := hugo.Data.feature_data }}
 {{ if not $features }}
 {{ with readFile "data/feature_data.json" }}
 {{ $features = . | transform.Unmarshal }}
@@ -63,4 +63,4 @@
 </div>
 {{ end }}
 {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}