diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ae71fb3..4bb1213 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,14 +7,14 @@
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <meta name="theme-color" content="#404040">
 
-    <meta property="og:title" content="{{ if ne .URL " / " }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
+    <meta property="og:title" content="{{ if ne .RelPermalink " / " }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
     <meta property="og:site_name" content="{{ .Site.Title }}" />
     <meta property="og:url" content="{{ .Permalink }}" />
     {{ .Render "meta" }}
 
     <link rel="icon" href="{{ .Site.BaseURL }}/favicon.ico" />
     <link rel="shortcut icon" href="{{ .Site.BaseURL }}/favicon.ico" type="image/x-icon" />
-    <link rel="canonical" href="{{ .Permalink }}"> {{ if .RSSLink }}
+    <link rel="canonical" href="{{ .Permalink }}"> {{ if .OutputFormats.Get "RSS" }}
     <link href="{{ .Site.BaseURL }}/index.xml" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
     <link href="{{ .Site.BaseURL }}/index.xml" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }}
 
diff --git a/layouts/partials/layout/pagination.html b/layouts/partials/layout/pagination.html
index 90ee66c..fca1063 100755
--- a/layouts/partials/layout/pagination.html
+++ b/layouts/partials/layout/pagination.html
@@ -7,17 +7,17 @@
     <nav class="pagination is-right" role="navigation" aria-label="pagination">
 
       {{ if $paginator.HasPrev }}
-        <a class="pagination-previous" href="{{ $paginator.Prev.URL }}">Previous Page</a>
+        <a class="pagination-previous" href="{{ $paginator.Prev.RelPermalink }}">Previous Page</a>
       {{ end }}
       
       {{ if $paginator.HasNext }}
-        <a class="pagination-next" href="{{ $paginator.Next.URL }}">Next Page</a>
+        <a class="pagination-next" href="{{ $paginator.Next.RelPermalink }}">Next Page</a>
       {{ end }}
 
       <ul class="pagination-list">
         {{ range $paginator.Pagers }}
         <li>
-          <a class="pagination-link" aria-label="Goto page {{ .PageNumber}}" href="{{ .URL }}">{{ .PageNumber }}</a>
+          <a class="pagination-link" aria-label="Goto page {{ .PageNumber}}" href="{{ .RelPermalink }}">{{ .PageNumber }}</a>
         </li>
         {{ end }}
       </ul>