diff -up Argyll_V1.4.0/gamut/maptest.c.warning Argyll_V1.4.0/gamut/maptest.c
--- Argyll_V1.4.0/gamut/maptest.c.warning	2012-06-22 18:03:25.113289700 +0200
+++ Argyll_V1.4.0/gamut/maptest.c	2012-06-22 18:10:57.615637380 +0200
@@ -99,7 +99,7 @@ main(int argc, char *argv[]) {
 			else if (argv[fa][1] == 'i' || argv[fa][1] == 'I') {
 				if (na == NULL) usage();
 				fa = nfa;
-				strncpy(img_name,na,MAXNAMEL); img_name[MAXNAMEL] = '\000';
+				strncpy(img_name,na,MAXNAMEL); img_name[MAXNAMEL-1] = '\000';
 			}
 
 			else 
diff -up Argyll_V1.4.0/jcnf/test.c.warning Argyll_V1.4.0/jcnf/test.c
--- Argyll_V1.4.0/jcnf/test.c.warning	2012-06-22 18:02:57.401148828 +0200
+++ Argyll_V1.4.0/jcnf/test.c	2012-06-22 18:03:11.177723389 +0200
@@ -144,6 +144,7 @@ main(int argc, char *argv[]) {
 	jco->del(jco);
 
 	printf("We're done\n");
+	return 0;
 }
 
 void