@@ -197,12 +197,12 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFIRI *ret;
 
 	ret = [OFIRI fileIRIWithPath: self.currentDirectoryPath];
+	ret = [ret retain];
 
-	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
 #endif
 
@@ -224,12 +224,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFFileAttributes ret;
 
 	ret = [self attributesOfItemAtIRI: [OFIRI fileIRIWithPath: path]];
-
-	[ret retain];
+	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
@@ -454,11 +453,11 @@
 
 	for (OFIRI *IRI in IRIs)
 		[ret addObject: IRI.lastPathComponent];
 
 	[ret makeImmutable];
-	[ret retain];
+	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
@@ -484,11 +483,11 @@
 
 		objc_autoreleasePoolPop(pool2);
 	}
 
 	[ret makeImmutable];
-	[ret retain];
+	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
@@ -888,37 +887,69 @@
 		  withDestinationPath: target];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (OFData *)extendedAttributeForName: (OFString *)name ofItemAtIRI: (OFIRI *)IRI
+- (OFData *)extendedAttributeDataForName: (OFString *)name
+			     ofItemAtIRI: (OFIRI *)IRI
+{
+	OFIRIHandler *IRIHandler;
+
+	if (IRI == nil)
+		@throw [OFInvalidArgumentException exception];
+
+	if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
+		@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
+
+	return [IRIHandler extendedAttributeDataForName: name ofItemAtIRI: IRI];
+}
+
+#ifdef OF_FILE_MANAGER_SUPPORTS_EXTENDED_ATTRIBUTES
+- (OFData *)extendedAttributeDataForName: (OFString *)name
+			    ofItemAtPath: (OFString *)path
+{
+	void *pool = objc_autoreleasePoolPush();
+	OFData *ret;
+
+	ret = [self
+	    extendedAttributeDataForName: name
+			     ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
+	ret = [ret retain];
+
+	objc_autoreleasePoolPop(pool);
+
+	return [ret autorelease];
+}
+#endif
+
+- (void)setExtendedAttributeData: (OFData *)data
+			 forName: (OFString *)name
+		     ofItemAtIRI: (OFIRI *)IRI
 {
 	OFIRIHandler *IRIHandler;
 
 	if (IRI == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
 		@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
 
-	return [IRIHandler extendedAttributeForName: name ofItemAtIRI: IRI];
+	[IRIHandler setExtendedAttributeData: data
+				     forName: name
+				 ofItemAtIRI: IRI];
 }
 
 #ifdef OF_FILE_MANAGER_SUPPORTS_EXTENDED_ATTRIBUTES
-- (OFData *)extendedAttributeForName: (OFString *)name
-			ofItemAtPath: (OFString *)path
+- (void)setExtendedAttributeData: (OFData *)data
+			 forName: (OFString *)name
+		    ofItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFData *ret;
-
-	ret = [self extendedAttributeForName: name
-				 ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
-	[ret retain];
-
+	[self setExtendedAttributeData: data
+			       forName: name
+			   ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
 	objc_autoreleasePoolPop(pool);
-
-	return [ret autorelease];
 }
 #endif
 @end
 
 @implementation OFDefaultFileManager