@@ -491,11 +491,11 @@
 
 		queryData = [OFMutableData dataWithCapacity: 512];
 
 		/* Header */
 
-		tmp = OF_BSWAP16_IF_LE(_ID.uInt16Value);
+		tmp = OF_BSWAP16_IF_LE(_ID.unsignedShortValue);
 		[queryData addItems: &tmp
 			      count: 2];
 
 		/* RD */
 		tmp = OF_BSWAP16_IF_LE(1u << 8);
@@ -812,11 +812,11 @@
 	OFNumber *ID;
 	OFDNSResolverContext *context;
 
 	/* Random, unused ID */
 	do {
-		ID = [OFNumber numberWithUInt16: of_random16()];
+		ID = [OFNumber numberWithUnsignedShort: of_random16()];
 	} while ([_queries objectForKey: ID] != nil);
 
 	if (query.domainName.UTF8StringLength > 253)
 		@throw [OFOutOfRangeException exception];
 
@@ -911,11 +911,11 @@
 
 	if (length < 2)
 		/* We can't get the ID to get the context. Ignore packet. */
 		return true;
 
-	ID = [OFNumber numberWithUInt16: (buffer[0] << 8) | buffer[1]];
+	ID = [OFNumber numberWithUnsignedShort: (buffer[0] << 8) | buffer[1]];
 	context = [[[_queries objectForKey: ID] retain] autorelease];
 
 	if (context == nil)
 		return true;