diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index dd8a49f6c..638867119 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -193,7 +193,7 @@ int CCAMMenuHandler::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t da
 	return ret;
 }
 
-void CCAMMenuHandler::showHintBox (const neutrino_locale_t Caption, const char * const Text, uint32_t timeout)
+void CCAMMenuHandler::showHintBox (const neutrino_locale_t /*Caption*/, const char * const Text, uint32_t timeout)
 {
 	hideHintBox();
 	hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, Text);
diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index 0268a1608..418f3fc22 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -46,8 +46,8 @@
 
 CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon)
 {
-	const char * caption = g_Locale->getText(Caption);
-	init(caption, Text, Width, Icon);
+	const char * caption_tmp = g_Locale->getText(Caption);
+	init(caption_tmp, Text, Width, Icon);
 }
 
 CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon)
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 55f0e7cd2..bddeed8ec 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -586,7 +586,10 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
 	boxname = "Coolstream ";
 	switch(system_rev)
 	{
-	case 6:
+	case 1:
+		boxname = "TripleDragon";
+		break;
+	  case 6:
 		boxname += "HD1";
 		break;
 	case 7:
@@ -608,7 +611,7 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
 	}
 	break;
 	}
-	boxname += (g_info.delivery_system == DVB_S) ? " SAT":" CABLE";
+	boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
 	hh->printf("%s\n", boxname.c_str());
 
 
diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
index a87b7a5de..946791a79 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
@@ -28,6 +28,7 @@
 
 #include <zapit/channel.h>
 #include <zapit/bouquets.h>
+#include <cs_api.h>
 
 extern tallchans allchans;
 extern CBouquetManager *g_bouquetManager;
@@ -652,7 +653,38 @@ std::string  CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
 //-------------------------------------------------------------------------
 std::string  CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
 {
-	return "Coolstream";//FIXME
+	unsigned int system_rev = cs_get_revision();
+	std::string  boxname;
+	boxname = "Coolstream ";
+	switch(system_rev)
+	{
+	case 1:
+		boxname = "TripleDragon";
+		break;
+	  case 6:
+		boxname += "HD1";
+		break;
+	case 7:
+		boxname += "BSE";
+		break;
+	case 8:
+	case 9:
+		boxname += "Neo";
+		break;
+	case 10:
+		boxname += "Zee";
+		break;
+
+	default: {
+		char buffer[10];
+		snprintf(buffer, sizeof(buffer), "%u\n", system_rev);
+		boxname += "Unknown nr. ";
+		boxname += buffer;
+	}
+	break;
+	}
+	boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
+	return boxname;
 }
 //-------------------------------------------------------------------------
 // y-func : get stream info
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 40f89bf1c..c4e728742 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -855,7 +855,8 @@ void testNetworkSettings(const char* ip, const char* netmask, const char* broadc
 	}
 	else 
 	{
-		netGetIP("eth0", our_ip, our_mask, our_broadcast);
+	  	char eth[] = "eth0";
+		netGetIP(eth, our_ip, our_mask, our_broadcast);
 		netGetDefaultRoute(our_gateway);
 		netGetNameserver(our_nameserver);
 	}
@@ -908,8 +909,8 @@ void showCurrentNetworkSettings()
 	char router[16];
 	char nameserver[16];
 	std::string text;
-	
-	netGetIP("eth0", ip, mask, broadcast);
+	char eth[] = "eth0";
+	netGetIP(eth, ip, mask, broadcast);
 	if (ip[0] == 0) {
 		text = g_Locale->getText(LOCALE_NETWORKMENU_INACTIVE);
 	}