diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c
index ed42de61f..f22c99996 100644
--- a/lib/zstd_compress.c
+++ b/lib/zstd_compress.c
@@ -2282,8 +2282,8 @@ static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = {
     {  0, 22, 21, 22,  5,  5,  4, ZSTD_lazy2   },  /* level 13 */
     {  0, 22, 22, 23,  5,  5,  4, ZSTD_lazy2   },  /* level 14 */
     {  0, 23, 23, 23,  5,  5,  4, ZSTD_lazy2   },  /* level 15 */
-    {  0, 23, 21, 22,  5,  5,  4, ZSTD_btlazy2 },  /* level 16 */
-    {  0, 23, 24, 23,  4,  5,  4, ZSTD_btlazy2 },  /* level 17 */
+    {  0, 23, 22, 22,  5,  5,  4, ZSTD_btlazy2 },  /* level 16 */
+    {  0, 24, 24, 23,  4,  5,  4, ZSTD_btlazy2 },  /* level 17 */
     {  0, 24, 25, 24,  4,  4, 24, ZSTD_opt_bt  },  /* level 18 */
     {  0, 25, 25, 24,  5,  4, 40, ZSTD_opt_bt  },  /* level 19 */
     {  0, 26, 26, 25,  8,  4,256, ZSTD_opt_bt  },  /* level 20 */
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index c8a372828..cd285f515 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -392,12 +392,12 @@ int main(int argCount, const char** argv)
     /* IO Stream/File */
     FIO_setNotificationLevel(displayLevel);
     if (decode) {
-      if (filenameIdx==1)
+      if (filenameIdx==1 && outFileName)
         operationResult = FIO_decompressFilename(outFileName, filenameTable[0], dictFileName);
       else
         operationResult = FIO_decompressMultipleFilenames(filenameTable, filenameIdx, forceStdout ? NULL : ZSTD_EXTENSION, dictFileName);
     } else {  /* compression */
-        if (filenameIdx==1)
+        if (filenameIdx==1 && outFileName)
           operationResult = FIO_compressFilename(outFileName, filenameTable[0], dictFileName, cLevel);
         else
           operationResult = FIO_compressMultipleFilenames(filenameTable, filenameIdx, forceStdout ? NULL : ZSTD_EXTENSION, dictFileName, cLevel);