Index: source/ariba/utility/messages/Message.h
===================================================================
--- source/ariba/utility/messages/Message.h	(revision 2995)
+++ source/ariba/utility/messages/Message.h	(revision 3037)
@@ -235,4 +235,16 @@
 		}
 		return NULL;
+	}
+	
+	/**
+	 * The same as decapsulate, but this function
+	 * is used in the samples to make the semantics easier
+	 * to understand. The semantics is shown to be: you get 
+	 * a message and convert it to your type. Not as: you 
+	 * get a message and have to extract your message from it.
+	 */  
+	template<class T>
+	inline T* convert() {
+		return decapsulate<T>();	
 	}
 
Index: source/ariba/utility/misc/Helper.cpp
===================================================================
--- source/ariba/utility/misc/Helper.cpp	(revision 2995)
+++ source/ariba/utility/misc/Helper.cpp	(revision 3037)
@@ -49,5 +49,5 @@
 	_ultoa_s (val, buf, 16, 10);
 #else
-	sprintf (buf, "%u", val);
+	sprintf (buf, "%lu", val);
 #endif
 
@@ -62,5 +62,5 @@
 	_ltoa_s (val, buf, 16, 10);
 #else
-	sprintf (buf, "%i", val);
+	sprintf (buf, "%li", val);
 #endif
 
@@ -75,5 +75,5 @@
 	_ultoa_s (val, buf, 16, 16);
 #else
-	sprintf (buf, "%x", val);
+	sprintf (buf, "%lx", val);
 #endif
 
@@ -93,5 +93,5 @@
 	_ltoa_s (val, buf, 16, 16);
 #else
-	sprintf (buf, "%x", val);
+	sprintf (buf, "%lx", val);
 #endif
 
Index: source/ariba/utility/system/StartupInterface.h
===================================================================
--- source/ariba/utility/system/StartupInterface.h	(revision 2995)
+++ source/ariba/utility/system/StartupInterface.h	(revision 3037)
@@ -45,11 +45,4 @@
 
 namespace ariba {
-namespace interface {
-	class UnderlayAbstraction;
-}}
-
-using ariba::interface::UnderlayAbstraction;
-
-namespace ariba {
 namespace utility {