diff --git a/src/eloop.c b/src/eloop.c
index e25cd36..60ec78a 100644
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -296,7 +296,7 @@ int kmscon_eloop_add_fd(struct kmscon_eloop *loop, struct kmscon_fd *fd,
 void kmscon_eloop_rm_fd(struct kmscon_fd *fd)
 {
 	struct kmscon_eloop *loop;
-	int i;
+	size_t i;
 
 	if (!fd || !fd->loop)
 		return;
diff --git a/src/output.c b/src/output.c
index b3e0669..3bf215b 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1131,8 +1131,8 @@ int kmscon_compositor_refresh(struct kmscon_compositor *comp)
 {
 	drmModeConnector *conn;
 	drmModeRes *res;
-	size_t i;
-	int cid;
+	int i;
+	uint32_t cid;
 	struct kmscon_output *output, *tmp;
 
 	if (!comp || comp->state != COMPOSITOR_AWAKE)