@@ -39,12 +39,12 @@
 	OF_KINDOF(OFStream *) _stream;
 	uint64_t _toRead;
 	bool _atEndOfStream;
 }
 
-- initWithStream: (OFStream *)stream
-	   entry: (OFTarArchiveEntry *)entry;
+- (instancetype)initWithStream: (OFStream *)stream
+			 entry: (OFTarArchiveEntry *)entry;
 - (void)of_skip;
 @end
 
 @interface OFTarArchive_FileWriteStream: OFStream
 {
@@ -51,12 +51,12 @@
 	OFTarArchiveEntry *_entry;
 	OFStream *_stream;
 	uint64_t _toWrite;
 }
 
-- initWithStream: (OFStream *)stream
-	   entry: (OFTarArchiveEntry *)entry;
+- (instancetype)initWithStream: (OFStream *)stream
+			 entry: (OFTarArchiveEntry *)entry;
 @end
 
 @implementation OFTarArchive: OFObject
 + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
 			     mode: (OFString *)mode
@@ -72,12 +72,12 @@
 	return [[[self alloc] initWithPath: path
 				      mode: mode] autorelease];
 }
 #endif
 
-- initWithStream: (OF_KINDOF(OFStream *))stream
-	    mode: (OFString *)mode
+- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
+			  mode: (OFString *)mode
 {
 	self = [super init];
 
 	@try {
 		_stream = [stream retain];
@@ -123,12 +123,12 @@
 
 	return self;
 }
 
 #ifdef OF_HAVE_FILES
-- initWithPath: (OFString *)path
-	  mode: (OFString *)mode
+- (instancetype)initWithPath: (OFString *)path
+			mode: (OFString *)mode
 {
 	OFFile *file;
 
 	if ([mode isEqual: @"a"])
 		file = [[OFFile alloc] initWithPath: path
@@ -260,12 +260,12 @@
 	_stream = nil;
 }
 @end
 
 @implementation OFTarArchive_FileReadStream
-- initWithStream: (OFStream *)stream
-	   entry: (OFTarArchiveEntry *)entry
+- (instancetype)initWithStream: (OFStream *)stream
+			 entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
 	@try {
 		_entry = [entry copy];
@@ -382,12 +382,12 @@
 	}
 }
 @end
 
 @implementation OFTarArchive_FileWriteStream
-- initWithStream: (OFStream *)stream
-	   entry: (OFTarArchiveEntry *)entry
+- (instancetype)initWithStream: (OFStream *)stream
+			 entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
 	@try {
 		_entry = [entry copy];