diff --git a/libasn1fix/asn1fix_cws.c b/libasn1fix/asn1fix_cws.c
index de2d240..ea0df20 100644
--- a/libasn1fix/asn1fix_cws.c
+++ b/libasn1fix/asn1fix_cws.c
@@ -371,7 +371,6 @@
                          struct asn1p_ioc_cell_s *cell, const uint8_t *buf,
                          const uint8_t *bend) {
     asn1p_expr_t *expr = (asn1p_expr_t *)NULL;
-	int idLength;
 	char *p;
 	int new_ref = 1;
 	asn1p_t *asn;
@@ -482,7 +481,7 @@
 	cell->value = expr;
 	cell->new_ref = new_ref;
 
-	idLength = strlen(expr->Identifier);
+	size_t idLength = strlen(expr->Identifier);
 	if(row->max_identifier_length < idLength)
 		row->max_identifier_length = idLength;
 
diff --git a/libasn1fix/asn1fix_misc.c b/libasn1fix/asn1fix_misc.c
index 23ae24f..283ed53 100644
--- a/libasn1fix/asn1fix_misc.c
+++ b/libasn1fix/asn1fix_misc.c
@@ -129,12 +129,11 @@
 			asn1p_ref_t *ref;
 			size_t reflen;
 			char *ptr;
-			int i;
 
 			assert(v->value.reference);
 			ref = v->value.reference;
 			reflen = ref->comp_count;	/* Number of dots */
-			for(i = 0; i < ref->comp_count; i++)
+			for(size_t i = 0; i < ref->comp_count; i++)
 				reflen += strlen(ref->components[i].name);
 			/*
 			 * Make sure we have a buffer of this size.
@@ -145,7 +144,7 @@
 			 * Fill-up the buffer.
 			 */
 			ptr = managedptr;
-			for(i = 0; i < ref->comp_count; i++) {
+			for(size_t i = 0; i < ref->comp_count; i++) {
 				char *nc;
 				if(i) *ptr++ = '.';
 				for(nc = ref->components[i].name; *nc; nc++)