diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index eef25db..ef5d008 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,9 +1,9 @@
 {{ range .AlternativeOutputFormats -}}
-<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
+<link rel="{{ .Rel }}" {{ printf "type=%q" .MediaType.Type | safeHTMLAttr }} title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
 {{ end -}}
 <meta name="description" content="{{ with (.Description | default (replaceRE "\n" " " (.Summary | truncate 170))) }}{{ . }}{{ end }}">
-<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
-<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
+<meta name="created" {{printf "content=%q" (.Date.Format "2006-01-02T15:04:05-0700") | safeHTMLAttr }}>
+<meta name="modified" {{printf "content=%q" (.Lastmod.Format "2006-01-02T15:04:05-0700") | safeHTMLAttr }}>
 {{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <meta property="og:site_name" content="{{ .Site.Title }}">
diff --git a/layouts/partials/submitted.html b/layouts/partials/submitted.html
index 5ea47af..f1a6de0 100644
--- a/layouts/partials/submitted.html
+++ b/layouts/partials/submitted.html
@@ -1,4 +1,4 @@
-<p class="submitted">
+<div class="submitted">
 {{ with $.Param "author" }}<span class="author" itemprop="author">{{ . }}</span> – {{ end -}}
 <time class="modified-date" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format ($.Param "dateformat" | default "2 January, 2006") }}</time>
-</p>
+</div>