diff --git a/init.c b/init.c
index ee9ab7d..570095a 100644
--- a/init.c
+++ b/init.c
@@ -137,9 +137,9 @@
 		char tmp[PATH_MAX];
 
 		if (td->directory && td->directory[0] != '\0')
-			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->jobnum);
+			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
 		else
-			sprintf(tmp, "%s.%d", jobname, td->jobnum);
+			sprintf(tmp, "%s.%d", jobname, td->thread_number);
 		td->file_name = strdup(tmp);
 	} else
 		td->file_name = strdup(jobname);
@@ -195,7 +195,6 @@
 
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
-		td_new->jobnum = numjobs;
 		job_add_num = numjobs - 1;
 
 		if (add_job(td_new, jobname, job_add_num))
@@ -616,7 +615,7 @@
 		/*
 		 * Seperate multiple job files by a stonewall
 		 */
-		if (stonewall) {
+		if (!global && stonewall) {
 			td->stonewall = stonewall;
 			stonewall = 0;
 		}