@@ -127,41 +127,41 @@
 {
 	return [[[self alloc] initWithFile: path] autorelease];
 }
 #endif
 
-- init
+- (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithName: (OFString *)name
+- (instancetype)initWithName: (OFString *)name
 {
 	return [self initWithName: name
 			namespace: nil
 		      stringValue: nil];
 }
 
-- initWithName: (OFString *)name
-   stringValue: (OFString *)stringValue
+- (instancetype)initWithName: (OFString *)name
+		 stringValue: (OFString *)stringValue
 {
 	return [self initWithName: name
 			namespace: nil
 		      stringValue: stringValue];
 }
 
-- initWithName: (OFString *)name
-     namespace: (OFString *)namespace
+- (instancetype)initWithName: (OFString *)name
+		   namespace: (OFString *)namespace
 {
 	return [self initWithName: name
 			namespace: namespace
 		      stringValue: nil];
 }
 
-- initWithName: (OFString *)name
-     namespace: (OFString *)namespace
-   stringValue: (OFString *)stringValue
+- (instancetype)initWithName: (OFString *)name
+		   namespace: (OFString *)namespace
+		 stringValue: (OFString *)stringValue
 {
 	self = [super of_init];
 
 	@try {
 		if (name == nil)
@@ -183,11 +183,11 @@
 	}
 
 	return self;
 }
 
-- initWithElement: (OFXMLElement *)element
+- (instancetype)initWithElement: (OFXMLElement *)element
 {
 	self = [super of_init];
 
 	@try {
 		if (element == nil)
@@ -205,11 +205,11 @@
 	}
 
 	return self;
 }
 
-- initWithXMLString: (OFString *)string
+- (instancetype)initWithXMLString: (OFString *)string
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
 	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
@@ -240,11 +240,11 @@
 
 	return self;
 }
 
 #ifdef OF_HAVE_FILES
-- initWithFile: (OFString *)path
+- (instancetype)initWithFile: (OFString *)path
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
 	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
@@ -272,11 +272,11 @@
 
 	return self;
 }
 #endif
 
-- initWithSerialization: (OFXMLElement *)element
+- (instancetype)initWithSerialization: (OFXMLElement *)element
 {
 	self = [super of_init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
@@ -1075,10 +1075,10 @@
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
 
-- copy
+- (id)copy
 {
 	return [[[self class] alloc] initWithElement: self];
 }
 @end