diff --git a/xsl/annotation.xsl b/xsl/annotation.xsl
index 92c1a67..04734fc 100644
--- a/xsl/annotation.xsl
+++ b/xsl/annotation.xsl
@@ -20,7 +20,10 @@
     <xsl:choose>
       <xsl:when test="count(key('named-entities', $name))=1
                       and ($translated-name=$name)">
-        <xsl:value-of select="$name"/>
+        <xsl:call-template name="fully-qualified-name">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="separator" select="'.'"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="generate-id(.)"/>
diff --git a/xsl/docbook.xsl b/xsl/docbook.xsl
index 2fcc6c7..0456053 100644
--- a/xsl/docbook.xsl
+++ b/xsl/docbook.xsl
@@ -112,11 +112,12 @@
           </xsl:call-template>
         </xsl:if>
 
-        <xsl:if test="namespace|class|struct|union">
+        <xsl:if test="descendant::class|descendant::struct|descendant::union
+                      |descendant::function|descendant::free-function-group">
           <xsl:call-template name="synopsis">
             <xsl:with-param name="text">
               <xsl:apply-templates mode="synopsis" 
-                select="namespace|class|struct|union">
+                select="namespace|class|struct|union|function|free-function-group">
                 <xsl:with-param name="indentation" select="0"/>
               </xsl:apply-templates>
             </xsl:with-param>
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index a243bc8..c3266f1 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -579,12 +579,20 @@ Cannot handle compounddef with kind=<xsl:value-of select="@kind"/>
         </method-group>
       </xsl:when>
       <xsl:when test="@kind='public-func'">
-        <method-group name="public member functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-        <xsl:apply-templates/>
+        <xsl:variable name="members" select="./memberdef"/>
+        <xsl:variable name="num-internal-only">
+          <xsl:value-of 
+            select="count($members[contains(detaileddescription/para,
+                                  'INTERNAL ONLY')])"/>
+        </xsl:variable>
+        <xsl:if test="$num-internal-only &lt; count($members)">
+          <method-group name="public member functions">
+            <xsl:apply-templates>
+              <xsl:with-param name="in-section" select="true()"/>
+            </xsl:apply-templates>
+          </method-group>
+          <xsl:apply-templates/>
+        </xsl:if>
       </xsl:when>
       <xsl:when test="@kind='protected-func'">
         <method-group name="protected member functions">
diff --git a/xsl/function.xsl b/xsl/function.xsl
index e24a988..7d20b83 100644
--- a/xsl/function.xsl
+++ b/xsl/function.xsl
@@ -1103,50 +1103,54 @@
 
   <!-- Group member functions together under a category name (synopsis)-->
   <xsl:template match="method-group" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <emphasis>
-      <xsl:text>// </xsl:text>
-      <xsl:call-template name="internal-link">
-        <xsl:with-param name="to">
-          <xsl:call-template name="generate.id"/>
-        </xsl:with-param>
-        <xsl:with-param name="text" select="string(@name)"/>
+    <xsl:if test="count(child::*) &gt; 0">
+      <xsl:param name="indentation"/>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:call-template name="indent">
+        <xsl:with-param name="indentation" select="$indentation"/>
       </xsl:call-template>
-    </emphasis>
-    <xsl:apply-templates select="method|overloaded-method" 
-      mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:apply-templates>
+      <emphasis>
+        <xsl:text>// </xsl:text>
+        <xsl:call-template name="internal-link">
+          <xsl:with-param name="to">
+            <xsl:call-template name="generate.id"/>
+          </xsl:with-param>
+          <xsl:with-param name="text" select="string(@name)"/>
+        </xsl:call-template>
+      </emphasis>
+      <xsl:apply-templates select="method|overloaded-method" 
+        mode="synopsis">
+        <xsl:with-param name="indentation" select="$indentation"/>
+      </xsl:apply-templates>
+    </xsl:if>
   </xsl:template>
 
   <!-- Group member functions together under a category name (reference)-->
   <xsl:template match="method-group" mode="reference">
-    <xsl:call-template name="member-documentation">
-      <xsl:with-param name="name">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id"/>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="''"/>
-        </xsl:call-template>
-        <xsl:call-template name="monospaced">
-          <xsl:with-param name="text" select="../@name"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>
-      </xsl:with-param>
-      <xsl:with-param name="text">
-        <orderedlist>
-          <xsl:apply-templates select="method|overloaded-method"
-            mode="reference"/>
-        </orderedlist>
-      </xsl:with-param>
-    </xsl:call-template>
+    <xsl:if test="count(child::*) &gt; 0">
+      <xsl:call-template name="member-documentation">
+        <xsl:with-param name="name">
+          <xsl:call-template name="anchor">
+            <xsl:with-param name="to">
+              <xsl:call-template name="generate.id"/>
+            </xsl:with-param>
+            <xsl:with-param name="text" select="''"/>
+          </xsl:call-template>
+          <xsl:call-template name="monospaced">
+            <xsl:with-param name="text" select="../@name"/>
+          </xsl:call-template>
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="@name"/>
+        </xsl:with-param>
+        <xsl:with-param name="text">
+          <orderedlist>
+            <xsl:apply-templates select="method|overloaded-method"
+              mode="reference"/>
+          </orderedlist>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
   </xsl:template> 
 
   <!-- Group free functions together under a category name (synopsis)-->
diff --git a/xsl/global.xsl b/xsl/global.xsl
index 90e4081..28f1aca 100755
--- a/xsl/global.xsl
+++ b/xsl/global.xsl
@@ -61,6 +61,9 @@
     <xsl:text>;</xsl:text>
   </xsl:template>
   <xsl:template match="data-member" mode="generate.id">
-    <xsl:value-of select="@name" />
+    <xsl:call-template name="fully-qualified-name">
+      <xsl:with-param name="node" select="."/>
+      <xsl:with-param name="separator" select="'.'"/>
+    </xsl:call-template>
   </xsl:template>
 </xsl:stylesheet>