diff --git a/src/calc_stat.c b/src/calc_stat.c
index 719af89..82cad02 100644
--- a/src/calc_stat.c
+++ b/src/calc_stat.c
@@ -82,12 +82,12 @@ int main(int argc, char * * argv)
 			np = 0;
 			if(C2I(ligne[i])<32)
 			{
-				fprintf(stderr, "Warning, non printable character line %d : %s\n", nb_lignes, ligne);
+				if (!npflag) fprintf(stderr, "Warning, non printable character line %d : %s\n", nb_lignes, ligne);
 				np += 1;
 			}
 			if(C2I(ligne[i])>127)
 			{
-				fprintf(stderr, "Warning, non US ascii character line %d : %s\n", nb_lignes, ligne);
+				if (!npflag) fprintf(stderr, "Warning, non US ascii character line %d : %s\n", nb_lignes, ligne);
 				np += 1;
 			}
 			if((i>0) && (C2I(ligne[i-1])<32))
diff --git a/src/genmkvpwd.c b/src/genmkvpwd.c
index 5069e1a..76b3e21 100644
--- a/src/genmkvpwd.c
+++ b/src/genmkvpwd.c
@@ -230,7 +230,7 @@ int main(int argc, char * * argv)
 
 	if(max_lvl==0)
 	{
-		for(max_lvl=100;max_lvl<350;max_lvl++)
+		for(max_lvl=100;max_lvl<=400;max_lvl++)
 		{
 			nbparts = mem_alloc(256*(max_lvl+1)*sizeof(long long)*(max_len+1));
 			printf("lvl=%u (%lu KB for nbparts) ", max_lvl, 256UL*(max_lvl+1)*(max_len+1)*sizeof(long long)/1024);