diff --git a/src/sbbs3/chksmb.c b/src/sbbs3/chksmb.c
index bf94132894c216531e3471b038a19fd9da89d9da..8e5ea7c44d13bd5995015626f9accc029c088e46 100644
--- a/src/sbbs3/chksmb.c
+++ b/src/sbbs3/chksmb.c
@@ -73,7 +73,7 @@ char *faddrtoa(fidoaddr_t addr)
 	static char str[25];
 	char point[25];
 
-	sprintf(str,"%u:%u/%u",addr.zone,addr.net,addr.node);
+	sprintf(str,"%hu:%hu/%hu",addr.zone,addr.net,addr.node);
 	if(addr.point) {
 		sprintf(point,".%u",addr.point);
 		strcat(str,point); }
diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp
index 549e444619d2e55553811bc910aaa34ccd54b3ab..e063e7b71ee6a1d5cbcc16cf0881146c878c34aa 100644
--- a/src/sbbs3/fido.cpp
+++ b/src/sbbs3/fido.cpp
@@ -43,18 +43,18 @@ void pt_zone_kludge(fmsghdr_t hdr,int fido)
 {
 	char str[256];
 
-	sprintf(str,"\1INTL %u:%u/%u %u:%u/%u\r"
+	sprintf(str,"\1INTL %hu:%hu/%hu %hu:%hu/%hu\r"
 		,hdr.destzone,hdr.destnet,hdr.destnode
 		,hdr.origzone,hdr.orignet,hdr.orignode);
 	write(fido,str,strlen(str));
 
 	if(hdr.destpoint) {
-		sprintf(str,"\1TOPT %u\r"
+		sprintf(str,"\1TOPT %hu\r"
 			,hdr.destpoint);
 		write(fido,str,strlen(str)); }
 
 	if(hdr.origpoint) {
-		sprintf(str,"\1FMPT %u\r"
+		sprintf(str,"\1FMPT %hu\r"
 			,hdr.origpoint);
 		write(fido,str,strlen(str)); }
 }
diff --git a/src/sbbs3/misc.c b/src/sbbs3/misc.c
index 2d1b4bc8f9981ab35227efb69159ea5e127211fe..8095581e4bc0df64d1737a5efa89c72ccba2d95e 100644
--- a/src/sbbs3/misc.c
+++ b/src/sbbs3/misc.c
@@ -382,9 +382,9 @@ char *faddrtoa(faddr_t* addr, char* outstr)
 
 	if(addr==NULL)
 		return("0:0/0");
-	sprintf(str,"%u:%u/%u",addr->zone,addr->net,addr->node);
+	sprintf(str,"%hu:%hu/%hu",addr->zone,addr->net,addr->node);
 	if(addr->point) {
-		sprintf(point,".%u",addr->point);
+		sprintf(point,".%hu",addr->point);
 		strcat(str,point); }
 	if(outstr==NULL)
 		return(str);
diff --git a/src/sbbs3/rechocfg.c b/src/sbbs3/rechocfg.c
index 8644597bdac1d842fe3110812396bd19115e15ce..6b5352e4152119a301ec1ea6a2e2a37190691d57 100644
--- a/src/sbbs3/rechocfg.c
+++ b/src/sbbs3/rechocfg.c
@@ -175,21 +175,21 @@ char *faddrtoa(faddr_t addr)
 if(addr.zone==0xffff)
 	strcpy(str,"ALL");
 else {
-	sprintf(str,"%u:",addr.zone);
+	sprintf(str,"%hu:",addr.zone);
 	if(addr.net==0xffff)
 		strcat(str,"ALL");
 	else {
-		sprintf(tmp,"%u/",addr.net);
+		sprintf(tmp,"%hu/",addr.net);
 		strcat(str,tmp);
 		if(addr.node==0xffff)
 			strcat(str,"ALL");
 		else {
-			sprintf(tmp,"%u",addr.node);
+			sprintf(tmp,"%hu",addr.node);
 			strcat(str,tmp);
 			if(addr.point==0xffff)
 				strcat(str,".ALL");
 			else if(addr.point) {
-				sprintf(tmp,".%u",addr.point);
+				sprintf(tmp,".%hu",addr.point);
 				strcat(str,tmp); } } } }
 return(str);
 }
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 3396e27ec877f5407c1a3ef00c33767e6039a176..98ef73613ef205f0c25af11e6abe686d5bac990d 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -410,7 +410,7 @@ do {
 	sprintf(hdr.subj,"%.71s",subject);
 
 	fwrite(&hdr,sizeof(fmsghdr_t),1,fstream);
-	sprintf(str,"\1INTL %u:%u/%u %u:%u/%u\r"
+	sprintf(str,"\1INTL %hu:%hu/%hu %hu:%hu/%hu\r"
 		,hdr.destzone,hdr.destnet,hdr.destnode
 		,hdr.origzone,hdr.orignet,hdr.orignode);
 	fwrite(str,strlen(str),1,fstream);
@@ -421,10 +421,10 @@ do {
 		else
 			fwrite("\r",1,1,fstream); }
 	if(hdr.destpoint) {
-		sprintf(str,"\1TOPT %u\r",hdr.destpoint);
+		sprintf(str,"\1TOPT %hu\r",hdr.destpoint);
 		fwrite(str,strlen(str),1,fstream); }
 	if(hdr.origpoint) {
-		sprintf(str,"\1FMPT %u\r",hdr.origpoint);
+		sprintf(str,"\1FMPT %hu\r",hdr.origpoint);
 		fwrite(str,strlen(str),1,fstream); }
 	if(!file || (!(attr&ATTR_DIRECT) && file))
 		fwrite(body,strlen(body)+1,1,fstream);	/* Write additional NULL */
@@ -3232,7 +3232,7 @@ int import_netmail(char *path,fmsghdr_t hdr, FILE *fidomsg)
 	else
 		str[0]=0;
 	printf("import_netmail line %d\n",__LINE__);
-	sprintf(info,"%s%s%s (%u:%u/%u%s) To: %s (%u:%u/%u%s)"
+	sprintf(info,"%s%s%s (%hu:%hu/%hu%s) To: %s (%hu:%hu/%hu%s)"
 		,path,path[0] ? " ":""
 		,hdr.from,hdr.origzone,hdr.orignet,hdr.orignode,tmp
 		,hdr.to,hdr.destzone,hdr.destnet,hdr.destnode,str);
diff --git a/src/sbbs3/smbutil.c b/src/sbbs3/smbutil.c
index 367157a2cac7a98287d80b6a04cee793e337894b..6c27e9ab7fddcee474daa535122ddbc8b1026aad 100644
--- a/src/sbbs3/smbutil.c
+++ b/src/sbbs3/smbutil.c
@@ -488,7 +488,7 @@ char *faddrtoa(fidoaddr_t addr)
 	static char str[25];
 	char point[25];
 
-	sprintf(str,"%u:%u/%u",addr.zone,addr.net,addr.node);
+	sprintf(str,"%hu:%hu/%hu",addr.zone,addr.net,addr.node);
 	if(addr.point) {
 		sprintf(point,".%u",addr.point);
 		strcat(str,point); }