diff --git a/xsl/doxygen/collect.xsl b/xsl/doxygen/collect.xsl
index a207643..a2b07ba 100644
--- a/xsl/doxygen/collect.xsl
+++ b/xsl/doxygen/collect.xsl
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
+ 
+  <xsl:param name="doxygen.xml.path">./</xsl:param>
   
   <xsl:template match="/">
     <doxygen version="{doxygen/@version}">
       <!-- Load all doxgen generated xml files -->
       <xsl:for-each select="doxygen/compound">
-        <xsl:copy-of select="document( concat(
+        <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
                              @refid, '.xml' ) )/doxygen/*" />
       </xsl:for-each>
     </doxygen>
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index 0705f62..fe5f626 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -339,50 +339,50 @@ Cannot handle template parameter with type <xsl:value-of select="string(type)"/>
     <xsl:choose>
       <xsl:when test="@kind='public-static-func'">
         <!-- TBD: pass on the fact that these are static functions -->
-        <member-function-group name="Public static functions">
+        <method-group name="public static functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
       </xsl:when>
       <xsl:when test="@kind='protected-static-func'">
         <!-- TBD: pass on the fact that these are static functions -->
-        <member-function-group name="Protected static functions">
+        <method-group name="protected static functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
       </xsl:when>
       <xsl:when test="@kind='private-static-func'">
         <!-- TBD: pass on the fact that these are static functions -->
-        <member-function-group name="Private static functions">
+        <method-group name="private static functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
       </xsl:when>
       <xsl:when test="@kind='public-func'">
-        <member-function-group name="Public member functions">
+        <method-group name="public member functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:when test="@kind='protected-func'">
-        <member-function-group name="Protected member functions">
+        <method-group name="protected member functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:when test="@kind='private-func'">
-        <member-function-group name="Private member functions">
+        <method-group name="private member functions">
           <xsl:apply-templates>
             <xsl:with-param name="in-section" select="true()"/>
           </xsl:apply-templates>
-        </member-function-group>
+        </method-group>
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:when test="@kind='public-type'">
@@ -550,9 +550,9 @@ Cannot handle memberdef element with kind=<xsl:value-of select="@kind"/>
         </xsl:attribute>
         
         <!-- Return type -->
-        <xsl:attribute name="return-type">
+        <type>
           <xsl:value-of select="type"/>
-        </xsl:attribute>
+        </type>
 
         <xsl:call-template name="function.children"/>
       </function>
@@ -605,9 +605,9 @@ Cannot handle memberdef element with kind=<xsl:value-of select="@kind"/>
       </xsl:if>
 
       <!-- Return type -->
-      <xsl:attribute name="return-type">
+      <type>
         <xsl:value-of select="type"/>
-      </xsl:attribute>
+      </type>
 
       <xsl:call-template name="function.children"/>
     </method>
diff --git a/xsl/function.xsl b/xsl/function.xsl
index 8856c56..d331d4a 100644
--- a/xsl/function.xsl
+++ b/xsl/function.xsl
@@ -734,7 +734,7 @@
 
   <!-- The "standardese" function requirements mode uses ordered lists -->
   <xsl:template name="function.requirements.standardese">
-    <orderedlist spacing="compact">
+    <orderedlist spacing="compact" numeration="arabic">
       <xsl:apply-templates 
         select="requires|effects|postconditions|returns|throws|complexity|
                 notes|rationale"