@@ -107,24 +107,24 @@
 			bool empty = true;
 
 			if (![_stream isKindOfClass: [OFSeekableStream class]])
 				@throw [OFInvalidArgumentException exception];
 
-			[stream seekToOffset: -1024
-				      whence: SEEK_END];
-			[stream readIntoBuffer: buffer.c
-				   exactLength: 1024];
+			[_stream seekToOffset: -1024
+				       whence: SEEK_END];
+			[_stream readIntoBuffer: buffer.c
+				    exactLength: 1024];
 
 			for (size_t i = 0; i < 1024 / sizeof(uint32_t); i++)
 				if (buffer.u32[i] != 0)
 					empty = false;
 
 			if (!empty)
 				@throw [OFInvalidFormatException exception];
 
-			[stream seekToOffset: -1024
-				      whence: SEEK_END];
+			[_stream seekToOffset: -1024
+				       whence: SEEK_END];
 		}
 
 		_encoding = OF_STRING_ENCODING_UTF_8;
 	} @catch (id e) {
 		[self release];
@@ -402,11 +402,11 @@
 	}
 }
 @end
 
 @implementation OFTarArchive_FileWriteStream
-- (instancetype)of_initWithStream: (OFStream *)stream
+- (instancetype)of_initWithStream: (OF_KINDOF(OFStream *))stream
 			    entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
 	@try {