Index: src/OFData.m
==================================================================
--- src/OFData.m
+++ src/OFData.m
@@ -434,11 +434,11 @@
 		return false;
 
 	return true;
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	OFData *data;
 	int comparison;
 	size_t count, minCount;
 

Index: src/OFDate.m
==================================================================
--- src/OFDate.m
+++ src/OFDate.m
@@ -395,11 +395,11 @@
 - (id)copy
 {
 	return [self retain];
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	OFDate *otherDate;
 
 	if (![object isKindOfClass: [OFDate class]])
 		@throw [OFInvalidArgumentException exception];

Index: src/OFNumber.m
==================================================================
--- src/OFNumber.m
+++ src/OFNumber.m
@@ -761,11 +761,11 @@
 		return ([number intMaxValue] == [self intMaxValue]);
 
 	return ([number uIntMaxValue] == [self uIntMaxValue]);
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	OFNumber *number;
 
 	if (![object isKindOfClass: [OFNumber class]])
 		@throw [OFInvalidArgumentException exception];

Index: src/OFRunLoop.h
==================================================================
--- src/OFRunLoop.h
+++ src/OFRunLoop.h
@@ -41,11 +41,11 @@
 @interface OFRunLoop: OFObject
 #ifdef OF_HAVE_SOCKETS
     <OFKernelEventObserverDelegate>
 #endif
 {
-	OFSortedList *_timersQueue;
+	OFSortedList OF_GENERIC(OFTimer *) *_timersQueue;
 #ifdef OF_HAVE_THREADS
 	OFMutex *_timersQueueLock;
 #endif
 #if defined(OF_HAVE_SOCKETS)
 	OFKernelEventObserver *_kernelEventObserver;

Index: src/OFSortedList.h
==================================================================
--- src/OFSortedList.h
+++ src/OFSortedList.h
@@ -28,10 +28,19 @@
  */
 @interface OFSortedList OF_GENERIC(ObjectType): OFList OF_GENERIC(ObjectType)
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # define ObjectType id
 #endif
+- (of_list_object_t *)appendObject: (ObjectType)object OF_UNAVAILABLE;
+- (of_list_object_t *)prependObject: (ObjectType)object OF_UNAVAILABLE;
+- (of_list_object_t *)insertObject: (ObjectType)object
+		  beforeListObject: (of_list_object_t *)listObject
+    OF_UNAVAILABLE;
+- (of_list_object_t *)insertObject: (ObjectType)object
+		   afterListObject: (of_list_object_t *)listObject
+    OF_UNAVAILABLE;
+
 /*!
  * @brief Inserts the object to the list while keeping the list sorted.
  *
  * @param object The object to insert
  * @return The list object for the object just added

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -1550,11 +1550,11 @@
 - (id)mutableCopy
 {
 	return [[OFMutableString alloc] initWithString: self];
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	void *pool;
 	OFString *otherString;
 	const of_unichar_t *characters, *otherCharacters;
 	size_t minimumLength;

Index: src/OFString_UTF8.m
==================================================================
--- src/OFString_UTF8.m
+++ src/OFString_UTF8.m
@@ -806,11 +806,11 @@
 		return false;
 
 	return true;
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	OFString *otherString;
 	size_t otherCStringLength, minimumCStringLength;
 	int compare;
 

Index: src/OFTimer.m
==================================================================
--- src/OFTimer.m
+++ src/OFTimer.m
@@ -504,11 +504,11 @@
 #endif
 
 	[super dealloc];
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (id <OFObject, OFComparing>)object
 {
 	OFTimer *timer;
 
 	if (![object isKindOfClass: [OFTimer class]])
 		@throw [OFInvalidArgumentException exception];