Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -36,11 +36,11 @@
  * \brief An abstract class for storing objects in an array.
  */
 @interface OFArray: OFObject <OFCopying, OFMutableCopying, OFCollection,
     OFSerialization, OFJSON>
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, assign) size_t count;
+@property (readonly) size_t count;
 #endif
 
 /**
  * \brief Creates a new OFArray.
  *

Index: src/OFHTTPRequest.h
==================================================================
--- src/OFHTTPRequest.h
+++ src/OFHTTPRequest.h
@@ -114,16 +114,16 @@
 	BOOL storesData;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (copy) OFURL *URL;
-@property (assign) of_http_request_type_t requestType;
+@property of_http_request_type_t requestType;
 @property (copy) OFString *queryString;
 @property (copy) OFDictionary *headers;
-@property (assign) BOOL redirectsFromHTTPSToHTTPAllowed;
+@property BOOL redirectsFromHTTPSToHTTPAllowed;
 @property (assign) id <OFHTTPRequestDelegate> delegate;
-@property (assign) BOOL storesData;
+@property BOOL storesData;
 #endif
 
 /**
  * \brief Creates a new OFHTTPRequest.
  *

Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -47,11 +47,11 @@
 	BOOL   blocking;
 	BOOL   waitingForDelimiter;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (assign, getter=isBlocking) BOOL blocking;
+@property (getter=isBlocking) BOOL blocking;
 @property (readonly, getter=isAtEndOfStream) BOOL atEndOfStream;
 #endif
 
 /**
  * \brief Returns a boolean whether the end of the stream has been reached.

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -42,13 +42,13 @@
 	OFString		*SOCKS5Host;
 	uint16_t		SOCKS5Port;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (assign, readonly, getter=isListening) BOOL listening;
+@property (readonly, getter=isListening) BOOL listening;
 @property (copy) OFString *SOCKS5Host;
-@property (assign) uint16_t SOCKS5Port;
+@property uint16_t SOCKS5Port;
 #endif
 
 /**
  * \brief Sets the global SOCKS5 proxy host to use when creating a new socket
  *

Index: src/OFURL.h
==================================================================
--- src/OFURL.h
+++ src/OFURL.h
@@ -36,11 +36,11 @@
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (copy) OFString *scheme;
 @property (copy) OFString *host;
-@property (assign) uint16_t port;
+@property uint16_t port;
 @property (copy) OFString *user;
 @property (copy) OFString *password;
 @property (copy) OFString *path;
 @property (copy) OFString *parameters;
 @property (copy) OFString *query;

Index: src/OFXMLAttribute.h
==================================================================
--- src/OFXMLAttribute.h
+++ src/OFXMLAttribute.h
@@ -28,13 +28,13 @@
 	OFString *ns;
 	OFString *stringValue;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, retain) OFString *name;
-@property (readonly, retain, getter=namespace) OFString *ns;
-@property (readonly, retain) OFString *stringValue;
+@property (readonly, copy) OFString *name;
+@property (readonly, copy, getter=namespace) OFString *ns;
+@property (readonly, copy) OFString *stringValue;
 #endif
 
 /**
  * \brief Creates a new XML attribute.
  *

Index: src/OFXMLAttribute.m
==================================================================
--- src/OFXMLAttribute.m
+++ src/OFXMLAttribute.m
@@ -92,21 +92,21 @@
 	[super dealloc];
 }
 
 - (OFString*)name
 {
-	return [[name copy] autorelease];
+	OF_GETTER(name, YES)
 }
 
 - (OFString*)namespace
 {
-	return [[ns copy] autorelease];
+	OF_GETTER(ns, YES)
 }
 
 - (OFString*)stringValue
 {
-	return [[stringValue copy] autorelease];
+	OF_GETTER(stringValue, YES)
 }
 
 - (BOOL)isEqual: (id)object
 {
 	OFXMLAttribute *otherAttribute;

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -389,38 +389,37 @@
 	OF_SETTER(name, name_, YES, YES)
 }
 
 - (OFString*)name
 {
-	return [[name copy] autorelease];
+	OF_GETTER(name, YES)
 }
 
 - (void)setNamespace: (OFString*)ns_
 {
 	OF_SETTER(ns, ns_, YES, YES)
 }
 
 - (OFString*)namespace
 {
-	return [[ns copy] autorelease];
+	OF_GETTER(ns, YES)
 }
 
 - (OFArray*)attributes
 {
-	return [[attributes copy] autorelease];
+	OF_GETTER(attributes, YES)
 }
 
 - (void)setChildren: (OFArray*)children_
 {
-	OFMutableArray *new = [children_ mutableCopy];
-	[children release];
-	children = new;
+	/* 2 = mutableCopy */
+	OF_SETTER(children, children_, YES, 2)
 }
 
 - (OFArray*)children
 {
-	return [[children copy] autorelease];
+	OF_GETTER(children, YES)
 }
 
 - (void)setStringValue: (OFString*)stringValue
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];

Index: src/exceptions/OFAcceptFailedException.h
==================================================================
--- src/exceptions/OFAcceptFailedException.h
+++ src/exceptions/OFAcceptFailedException.h
@@ -26,11 +26,11 @@
 	OFTCPSocket *socket;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
+@property (readonly, assign) OFTCPSocket *socket;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFAddressTranslationFailedException.h
==================================================================
--- src/exceptions/OFAddressTranslationFailedException.h
+++ src/exceptions/OFAddressTranslationFailedException.h
@@ -27,12 +27,12 @@
 	OFString    *host;
 	int	    errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
-@property (readonly, nonatomic) OFString *host;
+@property (readonly, assign) OFTCPSocket *socket;
+@property (readonly, assign) OFString *host;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFAlreadyConnectedException.h
==================================================================
--- src/exceptions/OFAlreadyConnectedException.h
+++ src/exceptions/OFAlreadyConnectedException.h
@@ -26,11 +26,11 @@
 {
 	OFTCPSocket *socket;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
+@property (readonly, assign) OFTCPSocket *socket;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param socket The socket which is already connected

Index: src/exceptions/OFBindFailedException.h
==================================================================
--- src/exceptions/OFBindFailedException.h
+++ src/exceptions/OFBindFailedException.h
@@ -28,12 +28,12 @@
 	uint16_t    port;
 	int	    errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
-@property (readonly, nonatomic) OFString *host;
+@property (readonly, assign) OFTCPSocket *socket;
+@property (readonly, assign) OFString *host;
 @property (readonly) uint16_t port;
 @property (readonly) int errNo;
 #endif
 
 /**

Index: src/exceptions/OFChangeDirectoryFailedException.h
==================================================================
--- src/exceptions/OFChangeDirectoryFailedException.h
+++ src/exceptions/OFChangeDirectoryFailedException.h
@@ -24,11 +24,11 @@
 	OFString *path;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
+@property (readonly, assign) OFString *path;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFChangeFileModeFailedException.h
==================================================================
--- src/exceptions/OFChangeFileModeFailedException.h
+++ src/exceptions/OFChangeFileModeFailedException.h
@@ -27,11 +27,11 @@
 	mode_t mode;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
+@property (readonly, assign) OFString *path;
 @property (readonly) mode_t mode;
 @property (readonly) int errNo;
 #endif
 
 /**

Index: src/exceptions/OFChangeFileOwnerFailedException.h
==================================================================
--- src/exceptions/OFChangeFileOwnerFailedException.h
+++ src/exceptions/OFChangeFileOwnerFailedException.h
@@ -27,13 +27,13 @@
 	OFString *group;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
-@property (readonly, nonatomic) OFString *owner;
-@property (readonly, nonatomic) OFString *group;
+@property (readonly, assign) OFString *path;
+@property (readonly, assign) OFString *owner;
+@property (readonly, assign) OFString *group;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFConditionBroadcastFailedException.h
==================================================================
--- src/exceptions/OFConditionBroadcastFailedException.h
+++ src/exceptions/OFConditionBroadcastFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFCondition *condition;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFCondition *condition;
+@property (readonly, assign) OFCondition *condition;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param condition The condition which could not be broadcasted

Index: src/exceptions/OFConditionSignalFailedException.h
==================================================================
--- src/exceptions/OFConditionSignalFailedException.h
+++ src/exceptions/OFConditionSignalFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFCondition *condition;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFCondition *condition;
+@property (readonly, assign) OFCondition *condition;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param condition The condition which could not be signaled

Index: src/exceptions/OFConditionStillWaitingException.h
==================================================================
--- src/exceptions/OFConditionStillWaitingException.h
+++ src/exceptions/OFConditionStillWaitingException.h
@@ -26,11 +26,11 @@
 {
 	OFCondition *condition;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFCondition *condition;
+@property (readonly, assign) OFCondition *condition;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param condition The condition for which is still being waited

Index: src/exceptions/OFConditionWaitFailedException.h
==================================================================
--- src/exceptions/OFConditionWaitFailedException.h
+++ src/exceptions/OFConditionWaitFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFCondition *condition;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFCondition *condition;
+@property (readonly, assign) OFCondition *condition;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param condition The condition for which could not be waited

Index: src/exceptions/OFConnectionFailedException.h
==================================================================
--- src/exceptions/OFConnectionFailedException.h
+++ src/exceptions/OFConnectionFailedException.h
@@ -28,12 +28,12 @@
 	uint16_t    port;
 	int	    errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
-@property (readonly, nonatomic) OFString *host;
+@property (readonly, assign) OFTCPSocket *socket;
+@property (readonly, assign) OFString *host;
 @property (readonly) uint16_t port;
 @property (readonly) int errNo;
 #endif
 
 /**

Index: src/exceptions/OFCopyFileFailedException.h
==================================================================
--- src/exceptions/OFCopyFileFailedException.h
+++ src/exceptions/OFCopyFileFailedException.h
@@ -25,12 +25,12 @@
 	OFString *destinationPath;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *sourcePath;
-@property (readonly, nonatomic) OFString *destinationPath;
+@property (readonly, assign) OFString *sourcePath;
+@property (readonly, assign) OFString *destinationPath;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFCreateDirectoryFailedException.h
==================================================================
--- src/exceptions/OFCreateDirectoryFailedException.h
+++ src/exceptions/OFCreateDirectoryFailedException.h
@@ -24,11 +24,11 @@
 	OFString *path;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
+@property (readonly, assign) OFString *path;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFDeleteDirectoryFailedException.h
==================================================================
--- src/exceptions/OFDeleteDirectoryFailedException.h
+++ src/exceptions/OFDeleteDirectoryFailedException.h
@@ -24,11 +24,11 @@
 	OFString *path;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
+@property (readonly, assign) OFString *path;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFDeleteFileFailedException.h
==================================================================
--- src/exceptions/OFDeleteFileFailedException.h
+++ src/exceptions/OFDeleteFileFailedException.h
@@ -24,11 +24,11 @@
 	OFString *path;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
+@property (readonly, assign) OFString *path;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFException.h
==================================================================
--- src/exceptions/OFException.h
+++ src/exceptions/OFException.h
@@ -29,11 +29,11 @@
 	Class inClass;
 	OFString *description;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) Class inClass;
+@property (readonly) Class inClass;
 #endif
 
 /**
  * Creates a new exception.
  *

Index: src/exceptions/OFHTTPRequestFailedException.h
==================================================================
--- src/exceptions/OFHTTPRequestFailedException.h
+++ src/exceptions/OFHTTPRequestFailedException.h
@@ -27,12 +27,12 @@
 	OFHTTPRequest *HTTPRequest;
 	OFHTTPRequestResult *result;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFHTTPRequest *HTTPRequest;
-@property (readonly, nonatomic) OFHTTPRequestResult *result;
+@property (readonly, assign) OFHTTPRequest *HTTPRequest;
+@property (readonly, assign) OFHTTPRequestResult *result;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param request The HTTP request which failed

Index: src/exceptions/OFHashAlreadyCalculatedException.h
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.h
+++ src/exceptions/OFHashAlreadyCalculatedException.h
@@ -25,11 +25,11 @@
 {
 	OFHash *hashObject;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFHash *hashObject;
+@property (readonly, assign) OFHash *hashObject;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param hash The hash which has already been calculated

Index: src/exceptions/OFLinkFailedException.h
==================================================================
--- src/exceptions/OFLinkFailedException.h
+++ src/exceptions/OFLinkFailedException.h
@@ -26,12 +26,12 @@
 	OFString *destinationPath;
 	int errNo;
 }
 
 # ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *sourcePath;
-@property (readonly, nonatomic) OFString *destinationPath;
+@property (readonly, assign) OFString *sourcePath;
+@property (readonly, assign) OFString *destinationPath;
 @property (readonly) int errNo;
 # endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFListenFailedException.h
==================================================================
--- src/exceptions/OFListenFailedException.h
+++ src/exceptions/OFListenFailedException.h
@@ -27,11 +27,11 @@
 	int	    backLog;
 	int	    errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFTCPSocket *socket;
+@property (readonly, assign) OFTCPSocket *socket;
 @property (readonly) int backLog;
 @property (readonly) int errNo;
 #endif
 
 /**

Index: src/exceptions/OFMalformedXMLException.h
==================================================================
--- src/exceptions/OFMalformedXMLException.h
+++ src/exceptions/OFMalformedXMLException.h
@@ -25,11 +25,11 @@
 {
 	OFXMLParser *parser;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFXMLParser *parser;
+@property (readonly, assign) OFXMLParser *parser;
 #endif
 
 /**
  * \param parser The parser which encountered malformed XML
  * \return A new malformed XML exception

Index: src/exceptions/OFMutexLockFailedException.h
==================================================================
--- src/exceptions/OFMutexLockFailedException.h
+++ src/exceptions/OFMutexLockFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFMutex *mutex;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFMutex *mutex;
+@property (readonly, assign) OFMutex *mutex;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param mutex The mutex which is could not be locked

Index: src/exceptions/OFMutexStillLockedException.h
==================================================================
--- src/exceptions/OFMutexStillLockedException.h
+++ src/exceptions/OFMutexStillLockedException.h
@@ -25,11 +25,11 @@
 {
 	OFMutex *mutex;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFMutex *mutex;
+@property (readonly, assign) OFMutex *mutex;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param mutex The mutex which is still locked

Index: src/exceptions/OFMutexUnlockFailedException.h
==================================================================
--- src/exceptions/OFMutexUnlockFailedException.h
+++ src/exceptions/OFMutexUnlockFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFMutex *mutex;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFMutex *mutex;
+@property (readonly, assign) OFMutex *mutex;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param mutex The mutex which could not be unlocked

Index: src/exceptions/OFNotConnectedException.h
==================================================================
--- src/exceptions/OFNotConnectedException.h
+++ src/exceptions/OFNotConnectedException.h
@@ -25,11 +25,11 @@
 {
 	OFStreamSocket *socket;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFStreamSocket *socket;
+@property (readonly, assign) OFStreamSocket *socket;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param socket The socket which is not connected

Index: src/exceptions/OFOpenFileFailedException.h
==================================================================
--- src/exceptions/OFOpenFileFailedException.h
+++ src/exceptions/OFOpenFileFailedException.h
@@ -25,12 +25,12 @@
 	OFString *mode;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *path;
-@property (readonly, nonatomic) OFString *mode;
+@property (readonly, assign) OFString *path;
+@property (readonly, assign) OFString *mode;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFReadOrWriteFailedException.h
==================================================================
--- src/exceptions/OFReadOrWriteFailedException.h
+++ src/exceptions/OFReadOrWriteFailedException.h
@@ -28,11 +28,11 @@
 @public
 	int	 errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFStream *stream;
+@property (readonly, assign) OFStream *stream;
 @property (readonly) size_t requestedLength;
 @property (readonly) int errNo;
 #endif
 
 /**

Index: src/exceptions/OFRenameFileFailedException.h
==================================================================
--- src/exceptions/OFRenameFileFailedException.h
+++ src/exceptions/OFRenameFileFailedException.h
@@ -25,12 +25,12 @@
 	OFString *destinationPath;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *sourcePath;
-@property (readonly, nonatomic) OFString *destinationPath;
+@property (readonly, assign) OFString *sourcePath;
+@property (readonly, assign) OFString *destinationPath;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFSeekFailedException.h
==================================================================
--- src/exceptions/OFSeekFailedException.h
+++ src/exceptions/OFSeekFailedException.h
@@ -30,11 +30,11 @@
 	int		 whence;
 	int		 errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFSeekableStream *stream;
+@property (readonly, assign) OFSeekableStream *stream;
 @property (readonly) off_t offset;
 @property (readonly) int whence;
 @property (readonly) int errNo;
 #endif
 

Index: src/exceptions/OFSetOptionFailedException.h
==================================================================
--- src/exceptions/OFSetOptionFailedException.h
+++ src/exceptions/OFSetOptionFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFStream *stream;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFStream *stream;
+@property (readonly, assign) OFStream *stream;
 #endif
 
 /**
  * \param stream The stream for which the option could not be set
  * \return A new set option failed exception

Index: src/exceptions/OFSymlinkFailedException.h
==================================================================
--- src/exceptions/OFSymlinkFailedException.h
+++ src/exceptions/OFSymlinkFailedException.h
@@ -26,12 +26,12 @@
 	OFString *destinationPath;
 	int errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFString *sourcePath;
-@property (readonly, nonatomic) OFString *destinationPath;
+@property (readonly, assign) OFString *sourcePath;
+@property (readonly, assign) OFString *destinationPath;
 @property (readonly) int errNo;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception

Index: src/exceptions/OFThreadJoinFailedException.h
==================================================================
--- src/exceptions/OFThreadJoinFailedException.h
+++ src/exceptions/OFThreadJoinFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFThread *thread;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFThread *thread;
+@property (readonly, assign) OFThread *thread;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param thread The thread which could not be joined

Index: src/exceptions/OFThreadStartFailedException.h
==================================================================
--- src/exceptions/OFThreadStartFailedException.h
+++ src/exceptions/OFThreadStartFailedException.h
@@ -25,11 +25,11 @@
 {
 	OFThread *thread;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFThread *thread;
+@property (readonly, assign) OFThread *thread;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param thread The thread which could not be started

Index: src/exceptions/OFThreadStillRunningException.h
==================================================================
--- src/exceptions/OFThreadStillRunningException.h
+++ src/exceptions/OFThreadStillRunningException.h
@@ -25,11 +25,11 @@
 {
 	OFThread *thread;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFThread *thread;
+@property (readonly, assign) OFThread *thread;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param thread The thread which is still running

Index: src/exceptions/OFUnboundNamespaceException.h
==================================================================
--- src/exceptions/OFUnboundNamespaceException.h
+++ src/exceptions/OFUnboundNamespaceException.h
@@ -24,12 +24,12 @@
 	OFString *ns;
 	OFString *prefix;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic, getter=namespace) OFString *ns;
-@property (readonly, nonatomic) OFString *prefix;
+@property (readonly, assign, getter=namespace) OFString *ns;
+@property (readonly, assign) OFString *prefix;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param ns The namespace which is unbound

Index: src/exceptions/OFUnsupportedProtocolException.h
==================================================================
--- src/exceptions/OFUnsupportedProtocolException.h
+++ src/exceptions/OFUnsupportedProtocolException.h
@@ -26,11 +26,11 @@
 {
 	OFURL *URL;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFURL *URL;
+@property (readonly, assign) OFURL *URL;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param url The URL whose protocol is unsupported