@@ -125,11 +125,11 @@
 	mode = OF_BSWAP16_IF_BE(mode);
 
 	[entry->_mode release];
 	entry->_mode = nil;
 
-	entry->_mode = [[OFNumber alloc] initWithUInt16: mode];
+	entry->_mode = [[OFNumber alloc] initWithUnsignedShort: mode];
 }
 
 static void
 parseGIDUIDExtension(OFLHAArchiveEntry *entry, OFData *extension,
     of_string_encoding_t encoding)
@@ -149,12 +149,12 @@
 	entry->_GID = nil;
 
 	[entry->_UID release];
 	entry->_UID = nil;
 
-	entry->_GID = [[OFNumber alloc] initWithUInt16: GID];
-	entry->_UID = [[OFNumber alloc] initWithUInt16: UID];
+	entry->_GID = [[OFNumber alloc] initWithUnsignedShort: GID];
+	entry->_UID = [[OFNumber alloc] initWithUnsignedShort: UID];
 }
 
 static void
 parseGroupExtension(OFLHAArchiveEntry *entry, OFData *extension,
     of_string_encoding_t encoding)
@@ -653,11 +653,11 @@
 		tmp16 = OF_BSWAP16_IF_BE(5);
 		[data addItems: &tmp16
 			 count: sizeof(tmp16)];
 		[data addItem: "\x50"];
 
-		tmp16 = OF_BSWAP16_IF_BE(_mode.uInt16Value);
+		tmp16 = OF_BSWAP16_IF_BE(_mode.unsignedShortValue);
 		[data addItems: &tmp16
 			 count: sizeof(tmp16)];
 	}
 
 	if (_UID != nil || _GID != nil) {
@@ -667,15 +667,15 @@
 		tmp16 = OF_BSWAP16_IF_BE(7);
 		[data addItems: &tmp16
 			 count: sizeof(tmp16)];
 		[data addItem: "\x51"];
 
-		tmp16 = OF_BSWAP16_IF_BE(_GID.uInt16Value);
+		tmp16 = OF_BSWAP16_IF_BE(_GID.unsignedShortValue);
 		[data addItems: &tmp16
 			 count: sizeof(tmp16)];
 
-		tmp16 = OF_BSWAP16_IF_BE(_UID.uInt16Value);
+		tmp16 = OF_BSWAP16_IF_BE(_UID.unsignedShortValue);
 		[data addItems: &tmp16
 			 count: sizeof(tmp16)];
 	}
 
 	if (_group != nil) {
@@ -759,11 +759,11 @@
 
 - (OFString *)description
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *mode = (_mode == nil ? nil
-	    : [OFString stringWithFormat: @"%" PRIo16, _mode.uInt16Value]);
+	    : [OFString stringWithFormat: @"%ho", _mode.unsignedShortValue]);
 	OFString *extensions = [_extensions.description
 	    stringByReplacingOccurrencesOfString: @"\n"
 				      withString: @"\n\t"];
 	OFString *ret = [OFString stringWithFormat:
 	    @"<%@:\n"