diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index e09ef94bd..7f91a2fe4 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -40,7 +40,7 @@ CCam::CCam()
 {
 	camask = 0;
 	demuxes = new int[MAX_DMX_UNITS];
-	for(int i = 0; i < MAX_DMX_UNITS; i++)
+	for(unsigned i = 0; i < MAX_DMX_UNITS; i++)
 		demuxes[i] = 0;
 	source_demux = -1;
 	calen = 0;
@@ -157,7 +157,7 @@ int CCam::makeMask(int demux, bool add)
 	else if(demuxes[demux] > 0)
 		demuxes[demux]--;
 
-	for(int i = 0; i < MAX_DMX_UNITS; i++) {
+	for(unsigned i = 0; i < MAX_DMX_UNITS; i++) {
 		if(demuxes[i] > 0)
 			mask |= 1 << i;
 	}
diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 5c969f9a8..ce51a4643 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -112,7 +112,7 @@ bool CFEManager::Init()
 				delete fe;
 		}
 	}
-	for (int i = 0; i < MAX_DMX_UNITS; i++)
+	for (unsigned i = 0; i < MAX_DMX_UNITS; i++)
 		dmap.push_back(CFeDmx(i));
 
 	INFO("found %d frontends, %d demuxes\n", (int)femap.size(), (int)dmap.size());
@@ -394,7 +394,7 @@ void CFEManager::linkFrontends(bool init)
 	enabled_count = 0;
 	unused_demux = 0;
 	int demuxes[MAX_DMX_UNITS];
-	for(int i = 0; i < MAX_DMX_UNITS; i++)
+	for(unsigned i = 0; i < MAX_DMX_UNITS; i++)
 		demuxes[i] = 0;
 	demuxes[0] = 1;
 	for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
@@ -446,11 +446,11 @@ void CFEManager::linkFrontends(bool init)
 			fe->Init();
 		if (femode != CFrontend::FE_MODE_UNUSED) {
 			enabled_count++;
-			if ((fe->fenumber + 1) < MAX_DMX_UNITS)
+			if ((fe->fenumber + 1) < (int) MAX_DMX_UNITS)
 				demuxes[fe->fenumber + 1] = 1;
 		}
 	}
-	for(int i = 0; i < MAX_DMX_UNITS; i++) {
+	for(unsigned i = 0; i < MAX_DMX_UNITS; i++) {
 		if (demuxes[i] == 0) {
 			unused_demux = i;
 			INFO("pip demux: %d\n", unused_demux);