diff --git a/gnmi_cli_py/py_gnmicli.py b/gnmi_cli_py/py_gnmicli.py
index 90c92dad..fa89820c 100644
--- a/gnmi_cli_py/py_gnmicli.py
+++ b/gnmi_cli_py/py_gnmicli.py
@@ -52,7 +52,7 @@
 _RE_PATH_COMPONENT = re.compile(r'''
 ^
 (?P<pname>[^[]+)  # gNMI path name
-(\[(?P<key>\w+)   # gNMI path key
+(\[(?P<key>[a-zA-Z0-9\-]+)   # gNMI path key
 =
 (?P<value>.*)    # gNMI path value
 \])?$
@@ -248,7 +248,7 @@ def _get_val(json_value):
           json_value.strip('@'), 'rb').read())
     except (IOError, ValueError) as e:
       raise JsonReadError('Error while loading JSON: %s' % str(e))
-    val.json_ietf_val = json.dumps(set_json)
+    val.json_ietf_val = json.dumps(set_json).encode('utf-8')
     return val
   coerced_val = _format_type(json_value)
   type_to_value = {bool: 'bool_val', int: 'int_val', float: 'float_val',