@@ -26,11 +26,11 @@
 	size_t fill = newcount * 4 / size;
 	size_t newsize;
 	struct of_dictionary_bucket *newdata;
 	uint32_t i;
 
-	if (newcount > SIZE_MAX / 4)
+	if (newcount > UINT32_MAX)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	if (fill >= 3)
 		newsize = size << 1;
 	else if (fill <= 1)
@@ -198,11 +198,11 @@
 
 - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
 			   objects: (id*)objects
 			     count: (int)count_
 {
-	size_t i;
+	int i;
 
 	for (i = 0; i < count_; i++) {
 		for (; state->state < size && (data[state->state].key == nil ||
 		    data[state->state].key == DELETED); state->state++);