diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index c7280b35c..90f911d31 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -225,7 +225,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
 	{"screenshot",		&CControlAPI::ScreenshotCGI,		""},
 #endif
 #ifdef ENABLE_GRAPHLCD
-        {"glcdscreenshot",	&CControlAPI::GlcdScreenshotCGI,	""},
+	{"glcdscreenshot",	&CControlAPI::GlcdScreenshotCGI,	""},
 #endif
 	// boxcontrol - devices
 	{"volume",		&CControlAPI::VolumeCGI,		"text/plain"},
@@ -3395,6 +3395,7 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh)
 
 	// build url
 	std::string url = host;
+	/* strip off optional custom port */
 	if (url.rfind(":") != 4)
 		url = url.substr(0, url.rfind(":")); // strip off optional custom port
 	url += ":31339/id=";
@@ -3448,6 +3449,7 @@ void CControlAPI::xmltvlistCGI(CyhookHandler *hh)
 	std::vector<std::string>::iterator it;
 	std::vector<std::string> url_list;
 	std::string tmp;
+	std::string::size_type i = 0;
 
 	if (!hh->ParamList["webtv"].empty())
 	{