@@ -1810,14 +1810,13 @@
 		break;
 	default:
 		@throw [OFInvalidArgumentException exception];
 	}
 
-	[sock asyncSendBuffer: [query->_queryData items]
-		       length: [query->_queryData count]
-		     receiver: query->_usedNameServer
-		  runLoopMode: runLoopMode];
+	[sock asyncSendData: query->_queryData
+		   receiver: &query->_usedNameServer
+		runLoopMode: runLoopMode];
 }
 
 - (void)of_queryWithIDTimedOut: (OFDNSResolverQuery *)query
 {
 	OFResolveHostFailedException *exception;
@@ -1868,11 +1867,11 @@
 }
 
 -	  (bool)socket: (OF_KINDOF(OFUDPSocket *))sock
   didReceiveIntoBuffer: (void *)buffer_
 		length: (size_t)length
-		sender: (of_socket_address_t)sender
+		sender: (const of_socket_address_t *)sender
 	     exception: (id)exception
 {
 	unsigned char *buffer = buffer_;
 	OFDictionary *answerRecords = nil, *authorityRecords = nil;
 	OFDictionary *additionalRecords = nil;
@@ -1890,11 +1889,11 @@
 	query = [[[_queries objectForKey: ID] retain] autorelease];
 
 	if (query == nil)
 		return true;
 
-	if (!of_socket_address_equal(&sender, &query->_usedNameServer))
+	if (!of_socket_address_equal(sender, &query->_usedNameServer))
 		return true;
 
 	[query->_cancelTimer invalidate];
 	[query->_cancelTimer release];
 	query->_cancelTimer = nil;