diff --git a/src/bluewave.c b/src/bluewave.c
index d59c863..55da216 100644
--- a/src/bluewave.c
+++ b/src/bluewave.c
@@ -89,7 +89,7 @@ int bwave_scan_email(int areano, int totmsgs, FILE *fti_file, FILE *mix_file, FI
 		memset(&fti, 0, sizeof(FTI_REC));
 		strlcpy(fti.from, sqlite3_column_text(res, 0), sizeof fti.from);
 		strlcpy(fti.to, gUser->loginname, sizeof fti.to);
-		strlcpy(fti.subject, sqlite3_column_text(res, 1), fti.subject);
+		strlcpy(fti.subject, sqlite3_column_text(res, 1), sizeof fti.subject);
 		thetime = sqlite3_column_int(res, 2);
 		localtime_r((time_t *)&thetime, &timeStruct);
 
@@ -341,18 +341,17 @@ void bwave_create_packet() {
 	area_count = 0;
 
 	memset(&hdr, 0, sizeof(INF_HEADER));
-
 	hdr.ver = PACKET_LEVEL;
-	strncpy(hdr.loginname, gUser->loginname, 42);
-	//strncpy(hdr.aliasname, gUser->loginname, 42);
+	strlcpy(hdr.loginname, gUser->loginname, sizeof hdr.loginname);
+	//strlcpy(hdr.aliasname, gUser->loginname, sizeof hdr.aliasname);
 	snprintf(hdr.aliasname, sizeof hdr.aliasname, "%s %s", gUser->firstname, gUser->lastname);
 	hdr.zone = converts(conf.main_aka->zone);
 	hdr.node = converts(conf.main_aka->node);
 	hdr.net = converts(conf.main_aka->net);
 	hdr.point = converts(conf.main_aka->point);
-	strncpy(hdr.sysop, conf.sysop_name, 40);
+	strlcpy(hdr.sysop, conf.sysop_name, sizeof hdr.sysop);
 
-	strncpy(hdr.systemname, conf.bbs_name, 64);
+	strlcpy(hdr.systemname, conf.bbs_name, sizeof hdr.systemname);
 	hdr.inf_header_len = converts(sizeof(INF_HEADER));
 	hdr.inf_areainfo_len = converts(sizeof(INF_AREA_INFO));
 	hdr.mix_structlen = converts(sizeof(MIX_REC));
@@ -423,11 +422,11 @@ void bwave_create_packet() {
 					flags = 0;
 					area = (INF_AREA_INFO *)malloz(sizeof(INF_AREA_INFO));
 
-					snprintf(area->areanum, 6, "%d", area_count + 1);
+					snprintf(area->areanum, sizeof area->areanum, "%d", area_count + 1);
 
-					memcpy(area->echotag, conf.mail_conferences[i]->mail_areas[j]->qwkname, strlen(conf.mail_conferences[i]->mail_areas[j]->qwkname));
+					strlcpy(area->echotag, conf.mail_conferences[i]->mail_areas[j]->qwkname, sizeof area->echotag);
 
-					strncpy(area->title, conf.mail_conferences[i]->mail_areas[j]->name, 49);
+					strlcpy(area->title, conf.mail_conferences[i]->mail_areas[j]->name, sizeof area->title);
 
 					if (conf.mail_conferences[i]->mail_areas[j]->write_sec_level <= gUser->sec_level) {
 						flags |= INF_POST;