diff --git a/cli/cli/c_actions.py b/cli/cli/c_actions.py
index 71622a2..4346af9 100755
--- a/cli/cli/c_actions.py
+++ b/cli/cli/c_actions.py
@@ -119,7 +119,7 @@
     tunnel_id=data['tunnel-id']
     url_str = "http://%s/rest/v1/tunnel/" % (sdnsh.controller)
     obj_data = {}
-    obj_data['tunnel-id']=data['tunnel_id']
+    obj_data['tunnel_id']=data['tunnel-id']
     data = sdnsh.store.rest_post_request(url_str,obj_data,'DELETE')
     if data != "deleted":
         result = json.loads(data)
@@ -167,7 +167,7 @@
     policy_id=data['policy-id']
     url_str = "http://%s/rest/v1/policy/" % (sdnsh.controller)
     obj_data = {}
-    obj_data['policy-id']=data['policy-id']
+    obj_data['policy_id']=data['policy-id']
     data = sdnsh.store.rest_post_request(url_str,obj_data,'DELETE')
     if data != "deleted":
         result = json.loads(data)
diff --git a/cli/cli/desc/version200/policy.py b/cli/cli/desc/version200/policy.py
index 13d21aa..a7642d1 100644
--- a/cli/cli/desc/version200/policy.py
+++ b/cli/cli/desc/version200/policy.py
@@ -83,12 +83,14 @@
                 },
                 {
                     'token'        : 'type',
+                    'optional-for-no' : True,
                     'short-help'   : 'Set type of policy',
                     'doc'          : 'policy|policy',
                     'completion'   : 'complete-object-field',
                 },
                 {
                     'field'        : 'policy-type',
+                    'optional-for-no' : True,
                     'type'         : 'enum',
                     'values'       : ('tunnel','loadbalanced','avoid','deny'), 
                     'completion'   : 'complete-object-field',