@@ -39,11 +39,12 @@
 
 static void
 register_class(struct objc_abi_class *cls)
 {
 	if (classes == NULL)
-		classes = objc_hashtable_new(2);
+		classes = objc_hashtable_new(
+		    objc_hash_string, objc_equal_string, 2);
 
 	objc_hashtable_set(classes, cls->name, cls);
 
 	if (empty_dtable == NULL)
 		empty_dtable = objc_sparsearray_new();
@@ -522,11 +523,11 @@
 		return classes_cnt;
 
 	if (classes_cnt < count)
 		count = classes_cnt;
 
-	for (i = j = 0; i <= classes->last_idx; i++) {
+	for (i = j = 0; i < classes->size; i++) {
 		Class cls;
 
 		if (j >= count) {
 			objc_global_mutex_unlock();
 			return j;
@@ -856,11 +857,11 @@
 	uint_fast32_t i;
 
 	if (classes == NULL)
 		return;
 
-	for (i = 0; i <= classes->last_idx; i++) {
+	for (i = 0; i < classes->size; i++) {
 		if (classes->data[i] != NULL) {
 			Class cls = (Class)classes->data[i]->obj;
 
 			if (cls == Nil || (uintptr_t)cls & 1)
 				continue;