@@ -475,11 +475,11 @@
 	unsigned long hash;
 
 	OFHashInit(&hash);
 
 	for (size_t i = 0; i < _count * _itemSize; i++)
-		OFHashAdd(&hash, ((uint8_t *)_items)[i]);
+		OFHashAddByte(&hash, ((uint8_t *)_items)[i]);
 
 	OFHashFinalize(&hash);
 
 	return hash;
 }
@@ -549,22 +549,22 @@
 
 	if (data == nil || data.itemSize != _itemSize)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((searchLength = data.count) == 0)
-		return OFRangeMake(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (searchLength > range.length)
-		return OFRangeMake(OFNotFound, 0);
+		return OFMakeRange(OFNotFound, 0);
 
 	search = data.items;
 
 	if (options & OFDataSearchBackwards) {
 		for (size_t i = range.length - searchLength;; i--) {
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return OFRangeMake(i, searchLength);
+				return OFMakeRange(i, searchLength);
 
 			/* No match and we're at the last item */
 			if (i == 0)
 				break;
 		}
@@ -571,14 +571,14 @@
 	} else {
 		for (size_t i = range.location;
 		    i <= range.length - searchLength; i++)
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return OFRangeMake(i, searchLength);
+				return OFMakeRange(i, searchLength);
 	}
 
-	return OFRangeMake(OFNotFound, 0);
+	return OFMakeRange(OFNotFound, 0);
 }
 
 #ifdef OF_HAVE_FILES
 - (void)writeToFile: (OFString *)path
 {