@@ -47,11 +47,12 @@
 {
 	struct objc_abi_category **cats;
 	Class cls = objc_classname_to_class(cat->class_name, false);
 
 	if (categories == NULL)
-		categories = objc_hashtable_new(2);
+		categories = objc_hashtable_new(
+		    objc_hash_string, objc_equal_string, 2);
 
 	cats = (struct objc_abi_category**)objc_hashtable_get(categories,
 	    cat->class_name);
 
 	if (cats != NULL) {
@@ -121,12 +122,12 @@
 	uint32_t i;
 
 	if (categories == NULL)
 		return;
 
-	for (i = 0; i <= categories->last_idx; i++)
+	for (i = 0; i < categories->size; i++)
 		if (categories->data[i] != NULL)
 			free((void*)categories->data[i]->obj);
 
 	objc_hashtable_free(categories);
 	categories = NULL;
 }