diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp
index 66644e4cd..461f72208 100644
--- a/src/cli/cli_dataset.cpp
+++ b/src/cli/cli_dataset.cpp
@@ -449,7 +449,7 @@ ThreadError Dataset::ProcessMgmtSetCommand(otInstance *aInstance, int argc, char
 {
     ThreadError error = kThreadError_None;
     otOperationalDataset dataset;
-    uint8_t tlvs[32];
+    uint8_t tlvs[128];
     long value;
     int length = 0;
     otIp6Address prefix;
@@ -489,7 +489,7 @@ ThreadError Dataset::ProcessMgmtSetCommand(otInstance *aInstance, int argc, char
             VerifyOrExit((length = static_cast<int>(strlen(argv[++index]))) <= OT_NETWORK_NAME_MAX_SIZE,
                          error = kThreadError_Parse);
             memset(&dataset.mNetworkName, 0, sizeof(sDataset.mNetworkName));
-            memcpy(dataset.mNetworkName.m8, argv[0], static_cast<size_t>(length));
+            memcpy(dataset.mNetworkName.m8, argv[index], static_cast<size_t>(length));
             length = 0;
         }
         else if (strcmp(argv[index], "extpanid") == 0)
diff --git a/src/cli/cli_uart.hpp b/src/cli/cli_uart.hpp
index 8b9f9e528..b42703d3c 100644
--- a/src/cli/cli_uart.hpp
+++ b/src/cli/cli_uart.hpp
@@ -97,7 +97,7 @@ public:
 private:
     enum
     {
-        kRxBufferSize = 128,
+        kRxBufferSize = 512,
         kTxBufferSize = 1024,
         kMaxLineLength = 128,
     };