diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index a6b9547..6ce3e10 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,5 +1,5 @@
 {{/*
   S'il n'y a pas de / dans l'url d'une image alors on ajoute le path de l'article
 */}}
-{{ $path := cond (in .Destination "/") .Destination (path.Join "/" .Page.Dir .Destination) }}
+{{ $path := cond (in .Destination "/") .Destination (path.Join "/" .Page.File.Dir .Destination) }}
 <img src="{{ $path | safeURL }}" alt="{{ .Text }}" {{ with .Title}} title="{{ . }}"{{ end }} />
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index 507ecd4..e2ecb09 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -7,7 +7,7 @@
 {{ $isMailtoLink := strings.HasPrefix .Destination "mailto:" }}
 {{ $hasSlash := in .Destination "/" }}
 {{- if $isWebLink -}}
-  {{ $link := cond (and $isWebLink (and (not $hasSlash) (not $isExternalLink))) (path.Join "/" .Page.Dir .Destination) .Destination }}
+  {{ $link := cond (and $isWebLink (and (not $hasSlash) (not $isExternalLink))) (path.Join "/" .Page.File.Dir .Destination) .Destination }}
   <a href="{{ $link | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isExternalLink }} target="_blank" rel="noopener"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- else -}}
   {{- $separators := cond $isMailtoLink ":@." ":" -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ca0f1c7..ba11c9e 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -6,7 +6,7 @@
       <ul>
         {{ block "list" . }}
         {{ range .Pages }}
-        <li><a href="{{ .URL }}">{{ .RenderString .Title }}</a></li>
+        <li><a href="{{ .Permalink }}">{{ .RenderString .Title }}</a></li>
         {{ end }}
         {{ end }}
       </ul>