diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index 421325d1bc3437b5df8e20bf0df3dab528043956..f0712b8e132b42b4519785abc59e00f0113b7405 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -179,13 +179,14 @@ namespace senf {
             sole member is a typedef symbol defining the callback type given the handle type.
 
             The Callback is any callable object taking a \c Handle and an \c EventId as argument.
-        template <class Handle>
-        struct GenericCallback {
-            typedef boost::function<void (typename boost::call_traits<Handle>::param_type,
-                                          EventId) > Callback;
-        };
+            \code
+            template <class Handle>
+            struct GenericCallback {
+                typedef boost::function<void (typename boost::call_traits<Handle>::param_type,
+                                              EventId) > Callback;
+            };
+            \endcode
          */
-
         typedef boost::function<void (EventId)> FdCallback;
 
         /** \brief Callback type for timer events */
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index ea9dc53b4f7f5631d3ff1d960c25a7012e25d90e..0091552206f1d4c4c9d894e5e779184f8c771a4f 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -26,7 +26,19 @@
 
 /** \defgroup handle_group The Handle Hierarchy
 
-    \image html FhHierarchy.png
+    \htmlonly 
+    <map name="FhHierarchy">
+      <area shape="rect" alt="FileHandle" href="classsenf_1_1FileHandle.html" title="FileHandle" coords="247,1,345,27" />
+      <area shape="rect" alt="SocketHandle" href="classsenf_1_1SocketHandle.html" title="SocketHandle" coords="235,61,355,87" />
+      <area shape="rect" alt="ClientSocketHandle" href="classsenf_1_1ClientSocketHandle.html" title="ClientSocketHandle" coords="32,140,198,167" />
+      <area shape="rect" alt="ServerSocketHandle" href="classsenf_1_1ServerSocketHandle.html" title="ServerSocketHandle" coords="386,140,558,168" />
+      <area shape="rect" alt="ProtocolServerSocketHandle" href="classsenf_1_1ProtocolServerSocketHandle.html" title="ProtocolServerSocketHandle" coords="354,202,590,228" />
+      <area shape="rect" alt="ProtocolClientSocketHandle" href="classsenf_1_1ProtocolClientSocketHandle.html" title="ProtocolClientSocketHandle" coords="1,202,230,228" />
+    </map>
+    <center>
+      <img src="FhHierarchy.png" border="0" alt="FhHierarchy" usemap="#FhHierarchy">
+    </center>
+    \endhtmlonly
 
     The senf::FileHandle class is the base of a hierarchy of socket handle classes (realized as
     templates). These classes provide an interface to the complete socket API. While going down the