@@ -60,21 +60,21 @@
 	objc_autoreleasePoolPop(pool);
 
 	return URL;
 }
 
-- init
+- (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)of_init
 {
 	return [super init];
 }
 
-- initWithString: (OFString *)string
+- (instancetype)initWithString: (OFString *)string
 {
 	char *UTF8String, *UTF8String2 = NULL;
 
 	self = [super init];
 
@@ -204,12 +204,12 @@
 	}
 
 	return self;
 }
 
-- initWithString: (OFString *)string
-   relativeToURL: (OFURL *)URL
+- (instancetype)initWithString: (OFString *)string
+		 relativeToURL: (OFURL *)URL
 {
 	char *UTF8String, *UTF8String2 = NULL;
 
 	if ([string containsString: @"://"])
 		return [self initWithString: string];
@@ -278,11 +278,11 @@
 	}
 
 	return self;
 }
 
-- initWithSerialization: (OFXMLElement *)element
+- (instancetype)initWithSerialization: (OFXMLElement *)element
 {
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		if (![[element name] isEqual: [self className]] ||
@@ -414,16 +414,16 @@
 - (OFString *)fragment
 {
 	return _fragment;
 }
 
-- copy
+- (id)copy
 {
 	return [self retain];
 }
 
-- mutableCopy
+- (id)mutableCopy
 {
 	OFMutableURL *copy = [[OFMutableURL alloc] init];
 
 	@try {
 		[copy setScheme: _scheme];