diff --git a/build/check_fixups.xsl b/build/check_fixups.xsl
index 583d8e64..53f90ee6 100644
--- a/build/check_fixups.xsl
+++ b/build/check_fixups.xsl
@@ -14,7 +14,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/build/check_imported.xsl b/build/check_imported.xsl
index 4daaa77e..e632f40d 100644
--- a/build/check_imported.xsl
+++ b/build/check_imported.xsl
@@ -13,7 +13,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:dyn="http://exslt.org/dynamic"
 	xmlns:set="http://exslt.org/sets"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build/check_misc.xsl b/build/check_misc.xsl
index 2a3b58e7..46e43662 100644
--- a/build/check_misc.xsl
+++ b/build/check_misc.xsl
@@ -12,7 +12,7 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
 	<!--
@@ -138,6 +138,6 @@
 		<xsl:call-template name="error">
 			<xsl:with-param name="m">bare 'ac.uk' scope not permitted</xsl:with-param>
 		</xsl:call-template>
-	</xsl:template>
+	</xsl:template>
 
 </xsl:stylesheet>
diff --git a/build/check_nokeyname.xsl b/build/check_nokeyname.xsl
index ae93274a..f0d62b53 100644
--- a/build/check_nokeyname.xsl
+++ b/build/check_nokeyname.xsl
@@ -14,7 +14,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build/check_saml2int.xsl b/build/check_saml2int.xsl
index 83f9ecaa..c4b828b2 100644
--- a/build/check_saml2int.xsl
+++ b/build/check_saml2int.xsl
@@ -15,7 +15,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build/check_shibboleth.xsl b/build/check_shibboleth.xsl
index b4e71b6e..dadb1b9a 100644
--- a/build/check_shibboleth.xsl
+++ b/build/check_shibboleth.xsl
@@ -17,7 +17,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
@@ -150,15 +150,15 @@
 	</xsl:template>
 	
 	
-	<!--
-		Check for Shibboleth Scope elements that don't include a regexp attribute.
-		This has a default in the schema so omitting it can cause signing brittleness.
-	-->
-	<xsl:template match="shibmd:Scope[not(@regexp)]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">Scope <xsl:value-of select="."/> lacks @regexp</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
+	<!--
+		Check for Shibboleth Scope elements that don't include a regexp attribute.
+		This has a default in the schema so omitting it can cause signing brittleness.
+	-->
+	<xsl:template match="shibmd:Scope[not(@regexp)]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">Scope <xsl:value-of select="."/> lacks @regexp</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
 
 
 	<!--
diff --git a/mdx/check_future_0.xsl b/mdx/check_future_0.xsl
index b3da4982..9bdec64c 100644
--- a/mdx/check_future_0.xsl
+++ b/mdx/check_future_0.xsl
@@ -14,7 +14,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:set="http://exslt.org/sets"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/clean-import.xsl b/mdx/clean-import.xsl
index bd2e66d5..f1a0095c 100644
--- a/mdx/clean-import.xsl
+++ b/mdx/clean-import.xsl
@@ -7,7 +7,7 @@
 	
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl
index bdc31334..a78e2339 100644
--- a/mdx/uk/statistics.xsl
+++ b/mdx/uk/statistics.xsl
@@ -106,7 +106,7 @@
         
         <xsl:variable name="embeddedX509Entities" select="$entities[descendant::ds:X509Data]"/>
         <xsl:variable name="embeddedX509EntityCount" select="count($embeddedX509Entities)"/>
-        
+        
         <html>
             <head>
                 <title>UK Federation metadata statistics</title>
@@ -139,7 +139,7 @@
                         <th align="left">Member</th>
                         <th>Entities</th>
                         <th>IdPs</th>
-                        <th>SPs</th>
+                        <th>SPs</th>
                         <th>OSrc</th>
                         <th align="left">Primary Scope</th>
                     </tr>
@@ -164,12 +164,12 @@
                 <xsl:variable name="membersWithJustSPs"
                     select="set:difference($membersWithSps, $membersWithIdPs)"/>
                 <xsl:variable name="membersWithNone"
-                    select="set:difference($members, $membersWithEither)"/>
-                <xsl:variable name="membersWithAthensIdP"
-                    select="$members[@usesAthensIdP = 'true']"/>
-                <xsl:variable name="membersWithJustAthensIdP"
-                    select="set:difference($membersWithAthensIdP, $membersWithEither)"/>
-                <xsl:variable name="membersWithNoneNoAthens"
+                    select="set:difference($members, $membersWithEither)"/>
+                <xsl:variable name="membersWithAthensIdP"
+                    select="$members[@usesAthensIdP = 'true']"/>
+                <xsl:variable name="membersWithJustAthensIdP"
+                    select="set:difference($membersWithAthensIdP, $membersWithEither)"/>
+                <xsl:variable name="membersWithNoneNoAthens"
                     select="set:difference($membersWithNone, $membersWithAthensIdP)"/>
                 <xsl:variable name="membersWithIdPsCount" select="count($membersWithIdPs)"/>
                 <xsl:variable name="membersWithSpsCount" select="count($membersWithSps)"/>
@@ -177,9 +177,9 @@
                 <xsl:variable name="membersWithEitherCount" select="count($membersWithEither)"/>
                 <xsl:variable name="membersWithJustIdPsCount" select="count($membersWithJustIdPs)"/>
                 <xsl:variable name="membersWithJustSPsCount" select="count($membersWithJustSPs)"/>
-                <xsl:variable name="membersWithNoneCount" select="count($membersWithNone)"/>
+                <xsl:variable name="membersWithNoneCount" select="count($membersWithNone)"/>
                 <xsl:variable name="membersWithJustAthensIdPCount" select="count($membersWithJustAthensIdP)"/>
-                <xsl:variable name="membersWithNoneNoAthensCount" select="count($membersWithNoneNoAthens)"/>
+                <xsl:variable name="membersWithNoneNoAthensCount" select="count($membersWithNoneNoAthens)"/>
                 <p>Breakdown of members by entity registration status:</p>
                 <ul>
                     <li>
@@ -224,28 +224,28 @@
                             (<xsl:value-of select="format-number($membersWithNoneCount div $memberCount, '0.0%')"/>)
                         </p>
                     </li>
-                    <li>
-                        <p>
-                            Without entities, but with Athens IdP access: <xsl:value-of select="$membersWithJustAthensIdPCount"/>
-                            (<xsl:value-of select="format-number($membersWithJustAthensIdPCount div $memberCount, '0.0%')"/>)
-                        </p>
-                    </li>
-                    <li>
-                        <p>
-                            Without entities, and with no Athens IdP access: <xsl:value-of select="$membersWithNoneNoAthensCount"/>
-                            (<xsl:value-of select="format-number($membersWithNoneNoAthensCount div $memberCount, '0.0%')"/>)
-                        </p>
-                    </li>
                     <li>
                         <p>
-                            Chart:
+                            Without entities, but with Athens IdP access: <xsl:value-of select="$membersWithJustAthensIdPCount"/>
+                            (<xsl:value-of select="format-number($membersWithJustAthensIdPCount div $memberCount, '0.0%')"/>)
+                        </p>
+                    </li>
+                    <li>
+                        <p>
+                            Without entities, and with no Athens IdP access: <xsl:value-of select="$membersWithNoneNoAthensCount"/>
+                            (<xsl:value-of select="format-number($membersWithNoneNoAthensCount div $memberCount, '0.0%')"/>)
+                        </p>
+                    </li>
+                    <li>
+                        <p>
+                            Chart:
                             <xsl:value-of select="$membersWithJustIdPsCount"/>,
-                            <xsl:value-of select="$membersWithJustSPsCount"/>,
-                            <xsl:value-of select="$membersWithBothCount"/>,
-                            <xsl:value-of select="$membersWithJustAthensIdPCount"/>,
-                            <xsl:value-of select="$membersWithNoneNoAthensCount"/>.                            
+                            <xsl:value-of select="$membersWithJustSPsCount"/>,
+                            <xsl:value-of select="$membersWithBothCount"/>,
+                            <xsl:value-of select="$membersWithJustAthensIdPCount"/>,
+                            <xsl:value-of select="$membersWithNoneNoAthensCount"/>.                            
                         </p>
-                    </li>
+                    </li>
                 </ul>
                 
                 <!--
@@ -383,7 +383,7 @@
                         <th>Entities</th>
                         <th>IdPs</th>
                         <th>SPs</th>
-                        <th>OSrc</th>
+                        <th>OSrc</th>
                         <th align="left">Scope</th>
                     </tr>
                     <xsl:apply-templates select="$nonMembers" mode="count">
@@ -490,7 +490,7 @@
                             </p>
                         </li>
                     </xsl:if>
-                    
+                    
                     <xsl:variable name="urnEntities" select="$entities[starts-with(@entityID, 'urn:')]"/>
                     <xsl:variable name="urnEntityCount" select="count($urnEntities)"/>
                     <xsl:if test="$urnEntityCount != 0">
@@ -1202,7 +1202,7 @@
                         <xsl:value-of select="count($matchedSPs)"/>
                     </xsl:otherwise>
                 </xsl:choose>
-            </td>
+            </td>
             
             <!-- Outsourcing in general -->
             <td align="center">