diff --git a/zipscript/src/audiosort-bin.c b/zipscript/src/audiosort-bin.c
index 3ab6ef0f..da2ffec0 100644
--- a/zipscript/src/audiosort-bin.c
+++ b/zipscript/src/audiosort-bin.c
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 					printf("Something bad happened when trying to decide what dir to resort.\n");
 					return 1;
 				}
-				snprintf(targetDir, PATH_MAX, "%s/%s", cwdDir, argv[1]);
+				safe_snprintf(targetDir, PATH_MAX, "%s/%s", cwdDir, argv[1]);
 			}
 		}
 	}
diff --git a/zipscript/src/audiosort.c b/zipscript/src/audiosort.c
index 0c464ff7..cf0c9ba4 100644
--- a/zipscript/src/audiosort.c
+++ b/zipscript/src/audiosort.c
@@ -19,7 +19,6 @@
 
 void audioSortDir(char *targetDir)
 {
-	int cnt = 0;
 	char link_source[PATH_MAX], link_target[PATH_MAX], *file_target = NULL;
 	struct audio info;
 	DIR *ourDir;
@@ -41,7 +40,7 @@ void audioSortDir(char *targetDir)
  * readsfv(sfv_data, &g.v, 0);
  */
 
-	cnt = extractDirname(link_target, targetDir);
+	extractDirname(link_target, targetDir);
 	strlcpy(link_source, targetDir, PATH_MAX);
 
 	if (chdir(targetDir) == -1) {
diff --git a/zipscript/src/convert.c b/zipscript/src/convert.c
index 949f6d11..0333f213 100644
--- a/zipscript/src/convert.c
+++ b/zipscript/src/convert.c
@@ -403,10 +403,10 @@ convert_audio(struct VARS *raceI, char *instr)
 char           *
 convert_sitename(char *instr)
 {
-	int		val1, val2;
-	char           *out_p;
-	char           *m;
-	char		ctrl[15];
+	int		val1;
+	char  *out_p;
+	char      *m;
+	char ctrl[15];
 
 	out_p = output2;
 
@@ -436,12 +436,7 @@ convert_sitename(char *instr)
 					instr++;
 				if (m != instr && instr-m < (int)sizeof(ctrl)) {
 					sprintf(ctrl, "%.*s", (int)(instr - m), m);
-					val2 = strtol(ctrl, NULL, 10);
-				} else {
-					val2 = 0;
 				}
-			} else {
-				val2 = -1;
 			}
 
 			switch (*instr) {
diff --git a/zipscript/src/mp3info.c b/zipscript/src/mp3info.c
index c9c4e831..147795c5 100644
--- a/zipscript/src/mp3info.c
+++ b/zipscript/src/mp3info.c
@@ -230,7 +230,7 @@ get_id3(mp3info * mp3, struct audio *audio)
 {
 	int		retcode = 1;
 	char		fbuf      [4];
-	int		ignore = 0;
+	int		ignore;
 
 	if (mp3->datasize > 128) {
 		if (fseek(mp3->file, -128, SEEK_END)) {
diff --git a/zipscript/src/postdel.c b/zipscript/src/postdel.c
index 3a462d6d..3d22f2c6 100644
--- a/zipscript/src/postdel.c
+++ b/zipscript/src/postdel.c
@@ -336,7 +336,7 @@ main(int argc, char **argv)
 	if (temp_p) {
 		while ((signed)strlen(temp_p) - 4 > 0)
 			temp_p++;
-		snprintf(fileext, 4, "%s", temp_p);
+		safe_snprintf(fileext, 4, "%s", temp_p);
 	} else
 		*fileext = '\0';
 
diff --git a/zipscript/src/postunnuke.c b/zipscript/src/postunnuke.c
index 81c86974..50448c0f 100644
--- a/zipscript/src/postunnuke.c
+++ b/zipscript/src/postunnuke.c
@@ -37,7 +37,7 @@
 int 
 main(int argc, char *argv[])
 {
-	int		k, n, m, l, complete_type = 0;
+	int		k, n, l, complete_type = 0;
 
 #ifdef USING_GLFTPD
         int             gnum = 0, unum = 0;
@@ -47,8 +47,11 @@ main(int argc, char *argv[])
 	unsigned int	crc;
 	struct stat	fileinfo;
 
+#ifdef USING_GLFTPD	
 	uid_t		f_uid;
 	gid_t		f_gid;
+#endif
+
 	double		temp_time = 0;
 
 	DIR		*dir, *parent;
@@ -247,7 +250,7 @@ main(int argc, char *argv[])
 		rewinddir(dir);
 		timenow = time(NULL);
 		while ((dp = readdir(dir))) {
-			m = l = (int)strlen(dp->d_name);
+			l = (int)strlen(dp->d_name);
 			
 			ext = find_last_of(dp->d_name, ".");
 			if (*ext == '.')
@@ -255,8 +258,6 @@ main(int argc, char *argv[])
 
 			if (!strcasecmp(ext, "zip")) {
 				stat(dp->d_name, &fileinfo);
-				f_uid = fileinfo.st_uid;
-				f_gid = fileinfo.st_gid;
 
 				if ((timenow == fileinfo.st_ctime) && (fileinfo.st_mode & 0111)) {
 					d_log("ng-post_unnuke: Seems this file (%s) is in the process of being uploaded. Ignoring for now.\n", dp->d_name);
@@ -264,6 +265,8 @@ main(int argc, char *argv[])
 				}
 
 #ifdef USING_GLFTPD
+				f_uid = fileinfo.st_uid;
+				f_gid = fileinfo.st_gid;
 				strcpy(g.v.user.name, get_u_name(f_uid));
 				strcpy(g.v.user.group, get_g_name(f_gid));
 #else
@@ -296,7 +299,7 @@ main(int argc, char *argv[])
 					writerace(g.l.race, &g.v, crc, F_CHECKED);
 				} else {
 					writerace(g.l.race, &g.v, crc, F_BAD);
-					if (g.v.file.name)
+					if (strlen(g.v.file.name) > 0)
 						unlink(g.v.file.name);
 				}
 			}
@@ -390,7 +393,7 @@ main(int argc, char *argv[])
 
 		if (copysfv(g.v.file.name, g.l.sfv, &g.v)) {
 			while ((dp = readdir(dir))) {
-				m = l = (int)strlen(dp->d_name);
+				l = (int)strlen(dp->d_name);
 				ext = find_last_of(dp->d_name, "-");
 				if (!strncmp(ext, "-missing", 8))
 					unlink(dp->d_name);
@@ -415,7 +418,7 @@ main(int argc, char *argv[])
 		g.v.total.start_time = 0;
 		rewinddir(dir);
 		while ((dp = readdir(dir))) {
-			m = l = (int)strlen(dp->d_name);
+			l = (int)strlen(dp->d_name);
 
 			ext = find_last_of(dp->d_name, ".");
 			if (*ext == '.')
@@ -444,10 +447,10 @@ main(int argc, char *argv[])
 				if (ignore_zero_sized_on_rescan && !fileinfo.st_size)
 					continue;
 
-				f_uid = fileinfo.st_uid;
-				f_gid = fileinfo.st_gid;
 
 #ifdef USING_GLFTPD
+				f_uid = fileinfo.st_uid;
+				f_gid = fileinfo.st_gid;
 				strcpy(g.v.user.name, get_u_name(f_uid));
 				strcpy(g.v.user.group, get_g_name(f_gid));
 #else
@@ -493,7 +496,7 @@ main(int argc, char *argv[])
  					crc = 1;
 
 				if (!S_ISDIR(fileinfo.st_mode)) {
-					if (g.v.file.name)
+					if (strlen(g.v.file.name) > 0)
 						unlink_missing(g.v.file.name);
 				}
 				if ((g.l.race && !match_file(g.l.race, dp->d_name)) || !fileexists(dp->d_name))
diff --git a/zipscript/src/race-file.c b/zipscript/src/race-file.c
index a04ec1af..d2957604 100644
--- a/zipscript/src/race-file.c
+++ b/zipscript/src/race-file.c
@@ -1196,7 +1196,6 @@ remove_lock(struct VARS *raceI)
 {
 	int			fd;
 	HEADDATA	hd;
-	char		lockfile[PATH_MAX + 1];
 
 	if ((fd = open(raceI->headpath, O_RDWR, 0666)) == -1) {
 		d_log_ext("remove_lock", "open(%s): %s\n", raceI->headpath, strerror(errno));
diff --git a/zipscript/src/rescan.c b/zipscript/src/rescan.c
index da2eee1f..80ce5c03 100644
--- a/zipscript/src/rescan.c
+++ b/zipscript/src/rescan.c
@@ -48,8 +48,10 @@ main(int argc, char *argv[])
 	unsigned int	crc;
 	struct stat	fileinfo;
 
+#ifdef USING_GLFTPD
 	uid_t		f_uid;
 	gid_t		f_gid;
+#endif
 	double		temp_time = 0;
 
 	DIR		*dir, *parent;
@@ -376,13 +378,13 @@ main(int argc, char *argv[])
 					ext++;
 				if (!strcasecmp(ext, "zip")) {
 					stat(dp->d_name, &fileinfo);
-					f_uid = fileinfo.st_uid;
-					f_gid = fileinfo.st_gid;
 					if ((timenow == fileinfo.st_ctime) && (fileinfo.st_mode & 0111)) {
 						d_log("rescan.c: Seems this file (%s) is in the process of being uploaded. Ignoring for now.\n", dp->d_name);
 						continue;
 					}
 #ifdef USING_GLFTPD
+					f_uid = fileinfo.st_uid;
+					f_gid = fileinfo.st_gid;
 					strlcpy(g.v.user.name, get_u_name(f_uid), sizeof(g.v.user.name));
 					strlcpy(g.v.user.group, get_g_name(f_gid), sizeof(g.v.user.group));
 #else
@@ -408,7 +410,7 @@ main(int argc, char *argv[])
 						writerace(g.l.race, &g.v, crc, F_CHECKED);
 					} else {
 						writerace(g.l.race, &g.v, crc, F_BAD);
-						if (g.v.file.name)
+						if (strlen(g.v.file.name) > 0)
 							unlink(g.v.file.name);
 						removedir(".unzipped");
 						continue;
@@ -418,7 +420,7 @@ main(int argc, char *argv[])
                         	        if ((!findfileextcount(dir, ".nfo") || findfileextcount(dir, ".zip")) && check_zipfile(".unzipped", g.v.file.name, findfileextcount(dir, ".nfo"))) {
                                 	        d_log("rescan: File %s is password protected.\n", g.v.file.name);
 						writerace(g.l.race, &g.v, crc, F_BAD);
-						if (g.v.file.name)
+						if (strlen(g.v.file.name) > 0)
 							unlink(g.v.file.name);
 						seekdir(dir, tempstream);
 						continue;
@@ -615,10 +617,9 @@ main(int argc, char *argv[])
 				if (ignore_zero_sized_on_rescan && !fileinfo.st_size)
 					continue;
 
+#ifdef USING_GLFTPD
 				f_uid = fileinfo.st_uid;
 				f_gid = fileinfo.st_gid;
-
-#ifdef USING_GLFTPD
 				strlcpy(g.v.user.name, get_u_name(f_uid), sizeof(g.v.user.name));
 				strlcpy(g.v.user.group, get_g_name(f_gid), sizeof(g.v.user.group));
 #else
@@ -664,7 +665,7 @@ main(int argc, char *argv[])
  					crc = 1;
 
 				if (!S_ISDIR(fileinfo.st_mode)) {
-					if (g.v.file.name)
+					if (strlen(g.v.file.name) > 0)
 						unlink_missing(g.v.file.name);
 					if (l > 44) {
 						if (crc == 1)
diff --git a/zipscript/src/zipscript-c.c b/zipscript/src/zipscript-c.c
index b4796b22..b848466e 100644
--- a/zipscript/src/zipscript-c.c
+++ b/zipscript/src/zipscript-c.c
@@ -215,7 +215,7 @@ main(int argc, char **argv)
 	char	       *norace_halfway_type = 0;
 	char	       *inc_point[2];
 	char	       *affillist = 0;
-	unsigned char	affil_upload = FALSE;
+
 #ifdef _WITH_SS5
 	unsigned char	complete_type = 1;
 #else
@@ -529,9 +529,14 @@ main(int argc, char **argv)
 			break;
 	}
 
+
 	if (strlen(zipscript_header))
 		printf(zipscript_header);
 
+
+	#if (enable_affil_script == TRUE )
+		unsigned char	affil_upload = FALSE;
+	#endif
 	/* Hide users in group_dirs */
 	if (hide_group_uploaders && matchpath(group_dirs, g.l.path)) {
 		d_log("zipscript-c: Hiding user in group-dir:\n");
@@ -554,7 +559,9 @@ main(int argc, char **argv)
 			affillist = ng_realloc2(affillist, 5000, 1, 1, 1);
 			create_dirlist(group_dirs, affillist, 5000);
 			if (strlen(affillist) && strcomp(affillist, g.v.user.group)) {
+				#if (enable_affil_script == TRUE )
 				affil_upload = TRUE;
+				#endif
 				d_log("zipscript-c: Hiding affil group based on group_dirs:\n");
 				if ((int)strlen(hide_affil_gname)) {
 					d_log("zipscript-c:    Changing groupname.\n");
@@ -576,7 +583,9 @@ main(int argc, char **argv)
 			ng_free(affillist);
 		}
 		if (strlen(hide_affil_groups) && strcomp(hide_affil_groups, g.v.user.group)) {
+			#if (enable_affil_script == TRUE )
 			affil_upload = TRUE;
+			#endif
 			d_log("zipscript-c: Hiding affil group:\n");
 			if ((int)strlen(hide_affil_gname)) {
 				d_log("zipscript-c:    Changing groupname.\n");
@@ -596,7 +605,9 @@ main(int argc, char **argv)
 				d_log("zipscript-c:    No hidename given.\n");
 		}
 		if (strlen(hide_affil_users) && strcomp(hide_affil_users, g.v.user.name)) {
+			#if (enable_affil_script == TRUE )
 			affil_upload = TRUE;
+			#endif
 			d_log("zipscript-c: Hiding affil user:\n");
 			if ((int)strlen(hide_affil_uname)) {
 				d_log("zipscript-c:    Changing username.\n");
diff --git a/zipscript/src/zsfunctions.c b/zipscript/src/zsfunctions.c
index 68404f4b..ee84da0a 100644
--- a/zipscript/src/zsfunctions.c
+++ b/zipscript/src/zsfunctions.c
@@ -57,7 +57,7 @@ vd_log(const char *fmt, va_list ap)
 
 #if ( debug_altlog == TRUE )
 	getcwd(debugpath, PATH_MAX);
-	snprintf(debugname, PATH_MAX, "%s/%s/debug",
+	safe_snprintf(debugname, PATH_MAX, "%s/%s/debug",
 	         storage, debugpath);
 #endif