diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index a9efe89..c5fe239 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -180,6 +180,10 @@
 
 				<hr />
 
+				<xsl:if test="//message">
+					<xsl:call-template name="message"/>
+				</xsl:if>
+
 				<xsl:if test="//search">
 					<xsl:call-template name="searchbar"/>
 				</xsl:if>
@@ -187,10 +191,6 @@
 				<xsl:if test="not(//frontpage)">
 					<xsl:call-template name="logo-small"/>
 				</xsl:if>
-
-				<xsl:if test="//message">
-					<xsl:call-template name="message"/>
-				</xsl:if>
 			
 			</xsl:if>
 			
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 0d070e9..e61562e 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -74,7 +74,7 @@
 				</div>
 			</xsl:when>
 			<xsl:otherwise>
-				<object>
+				<object type="application/ogg">
 					<xsl:attribute name="width">
 						<xsl:value-of select="//video/@width" />
 					</xsl:attribute>
@@ -273,7 +273,7 @@
 				<xsl:value-of select="$locale_strings[@id='protip_embed']" />
 				<br />
 				<span class="code">
-					&lt;object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />"
+					&lt;object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'embed=true')" />"
 						type="application/xml"
 						width=<xsl:value-of select="//video/@width + 24" />
 						height=<xsl:value-of select="//video/@height + 48" />