@@ -930,13 +930,13 @@
 
 		if ((length = OFUTF8StringDecode(_s->cString + i,
 		    _s->cStringLength - i, &c)) <= 0)
 			@throw [OFInvalidEncodingException exception];
 
-		OFHashAdd(&hash, (c & 0xFF0000) >> 16);
-		OFHashAdd(&hash, (c & 0x00FF00) >> 8);
-		OFHashAdd(&hash, c & 0x0000FF);
+		OFHashAddByte(&hash, (c & 0xFF0000) >> 16);
+		OFHashAddByte(&hash, (c & 0x00FF00) >> 8);
+		OFHashAddByte(&hash, c & 0x0000FF);
 
 		i += length - 1;
 	}
 
 	OFHashFinalize(&hash);
@@ -1004,14 +1004,14 @@
 		rangeLocation = range.location;
 		rangeLength = range.length;
 	}
 
 	if (cStringLength == 0)
-		return OFRangeMake(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (cStringLength > rangeLength)
-		return OFRangeMake(OFNotFound, 0);
+		return OFMakeRange(OFNotFound, 0);
 
 	if (options & OFStringSearchBackwards) {
 		for (size_t i = rangeLength - cStringLength;; i--) {
 			if (memcmp(_s->cString + rangeLocation + i, cString,
 			    cStringLength) == 0) {
@@ -1022,11 +1022,11 @@
 				return range;
 			}
 
 			/* Did not match and we're at the last char */
 			if (i == 0)
-				return OFRangeMake(OFNotFound, 0);
+				return OFMakeRange(OFNotFound, 0);
 		}
 	} else {
 		for (size_t i = 0; i <= rangeLength - cStringLength; i++) {
 			if (memcmp(_s->cString + rangeLocation + i, cString,
 			    cStringLength) == 0) {
@@ -1037,11 +1037,11 @@
 				return range;
 			}
 		}
 	}
 
-	return OFRangeMake(OFNotFound, 0);
+	return OFMakeRange(OFNotFound, 0);
 }
 
 - (bool)containsString: (OFString *)string
 {
 	const char *cString = string.UTF8String;