@@ -41,10 +41,12 @@
 		[ret appendString: component];
 
 		if (![component hasSuffix: @":"])
 			firstAfterDevice = false;
 	}
+
+	[ret makeImmutable];
 
 	objc_autoreleasePoolPop(pool);
 
 	return ret;
 }
@@ -57,18 +59,18 @@
 - (OFArray *)pathComponents
 {
 	OFMutableArray OF_GENERIC(OFString *) *ret = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
 	const char *cString = [self UTF8String];
-	size_t i, last = 0, pathCStringLength = [self UTF8StringLength];
+	size_t i, last = 0, cStringLength = [self UTF8StringLength];
 
-	if (pathCStringLength == 0) {
+	if (cStringLength == 0) {
 		objc_autoreleasePoolPop(pool);
 		return ret;
 	}
 
-	for (i = 0; i < pathCStringLength; i++) {
+	for (i = 0; i < cStringLength; i++) {
 		if (cString[i] == '/') {
 			if (i - last != 0)
 				[ret addObject: [OFString
 				    stringWithUTF8String: cString + last
 						  length: i - last]];