@@ -360,11 +360,11 @@
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	@try {
 		if (![iq ID])
 			[iq setID: [self generateStanzaID]];
 
-		[callbacks setObject: [XMPPObjectCallback
+		[callbacks setObject: [XMPPCallback
 					 callbackWithCallbackObject: object
 							   selector: selector]
 			      forKey: [iq ID]];
 	} @finally {
 		[pool release];
@@ -380,11 +380,11 @@
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	@try {
 		if (![iq ID])
 			[iq setID: [self generateStanzaID]];
 
-		[callbacks setObject: [XMPPBlockCallback
+		[callbacks setObject: [XMPPCallback
 					  callbackWithCallbackBlock: callback]
 			      forKey: [iq ID]];
 	} @finally {
 		[pool release];
 	}
@@ -695,11 +695,11 @@
 }
 
 - (void)XMPP_handleIQ: (XMPPIQ*)iq
 {
 	BOOL handled = NO;
-	id <XMPPCallback> callback;
+	XMPPCallback *callback;
 
 	if ((callback = [callbacks objectForKey: [iq ID]])) {
 		[callback runWithIQ: iq];
 		[callbacks removeObjectForKey: [iq ID]];
 		return;