diff --git a/code/daisyclient/daisyclient/common/http.py b/code/daisyclient/daisyclient/common/http.py
index f3e80f17..c64743cc 100755
--- a/code/daisyclient/daisyclient/common/http.py
+++ b/code/daisyclient/daisyclient/common/http.py
@@ -22,7 +22,7 @@ from daisyclient.common.utils import safe_header
 from daisyclient import exc
 from oslo_utils import importutils
 from oslo_utils import netutils
-
+from simplejson import decoder
 import requests
 try:
     from requests.packages.urllib3.exceptions import ProtocolError
diff --git a/code/daisyclient/daisyclient/v1/backup_restore.py b/code/daisyclient/daisyclient/v1/backup_restore.py
index d35d3366..9571b136 100755
--- a/code/daisyclient/daisyclient/v1/backup_restore.py
+++ b/code/daisyclient/daisyclient/v1/backup_restore.py
@@ -87,7 +87,7 @@ class BackupRestoreManager(base.ManagerWithFind):
 
         url = '/v1/backup'
         hdrs = self._backup_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return BackupRestore(self, body)
 
     def restore(self, **kwargs):
@@ -106,7 +106,7 @@ class BackupRestoreManager(base.ManagerWithFind):
         url = '/v1/restore'
 
         hdrs = self._restore_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
 
     def backup_file_version(self, **kwargs):
         """Get version of backup file.
@@ -123,7 +123,7 @@ class BackupRestoreManager(base.ManagerWithFind):
 
         url = '/v1/backup_file_version'
         hdrs = self._restore_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return BackupRestore(self, body)
 
     def version(self, **kwargs):
@@ -141,5 +141,5 @@ class BackupRestoreManager(base.ManagerWithFind):
 
         url = '/v1/version'
         hdrs = self._restore_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return BackupRestore(self, body)
diff --git a/code/daisyclient/daisyclient/v1/clusters.py b/code/daisyclient/daisyclient/v1/clusters.py
index df50d76c..43b72e4a 100755
--- a/code/daisyclient/daisyclient/v1/clusters.py
+++ b/code/daisyclient/daisyclient/v1/clusters.py
@@ -283,7 +283,7 @@ class ClusterManager(base.ManagerWithFind):
 
         hdrs = self._cluster_meta_to_headers(fields)
         resp, body = self.client.post('/v1/clusters',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/components.py b/code/daisyclient/daisyclient/v1/components.py
index 97a6125f..72898577 100755
--- a/code/daisyclient/daisyclient/v1/components.py
+++ b/code/daisyclient/daisyclient/v1/components.py
@@ -275,7 +275,7 @@ class ComponentManager(base.ManagerWithFind):
 
         hdrs = self._component_meta_to_headers(fields)
         resp, body = self.client.post('/v1/components',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/config_files.py b/code/daisyclient/daisyclient/v1/config_files.py
index eec99fcd..c0d3413f 100755
--- a/code/daisyclient/daisyclient/v1/config_files.py
+++ b/code/daisyclient/daisyclient/v1/config_files.py
@@ -241,7 +241,7 @@ class Config_fileManager(base.ManagerWithFind):
 
         hdrs = self._config_file_meta_to_headers(fields)
         resp, body = self.client.post('/v1/config_files',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/config_sets.py b/code/daisyclient/daisyclient/v1/config_sets.py
index 747486f2..743e9119 100755
--- a/code/daisyclient/daisyclient/v1/config_sets.py
+++ b/code/daisyclient/daisyclient/v1/config_sets.py
@@ -241,7 +241,7 @@ class Config_setManager(base.ManagerWithFind):
 
         hdrs = self._config_set_meta_to_headers(fields)
         resp, body = self.client.post('/v1/config_sets',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
@@ -301,7 +301,7 @@ class Config_setManager(base.ManagerWithFind):
 
         hdrs = self._config_set_meta_to_headers(fields)
         resp, body = self.client.post('/v1/cluster_config_set_update',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return Config_set(self, self._format_config_set_meta_for_user(
             body['config_set']))
@@ -322,6 +322,6 @@ class Config_setManager(base.ManagerWithFind):
 
         hdrs = self._config_set_meta_to_headers(fields)
         resp, body = self.client.post('/v1/cluster_config_set_progress',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return Config_set(self, self._format_config_set_meta_for_user(body))
diff --git a/code/daisyclient/daisyclient/v1/configs.py b/code/daisyclient/daisyclient/v1/configs.py
index ff899aa0..cf32fbd7 100755
--- a/code/daisyclient/daisyclient/v1/configs.py
+++ b/code/daisyclient/daisyclient/v1/configs.py
@@ -243,7 +243,7 @@ class ConfigManager(base.ManagerWithFind):
 
         hdrs = self._config_meta_to_headers(fields)
         resp, body = self.client.post('/v1/configs',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
@@ -260,7 +260,7 @@ class ConfigManager(base.ManagerWithFind):
                 continue
         hdrs = self._config_meta_to_headers(fields)
         url = "/v1/configs_delete"
-        resp, body = self.client.delete(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.delete(url, headers=None, data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
             return_request_id.append(resp.headers.get(OS_REQ_ID_HDR, None))
diff --git a/code/daisyclient/daisyclient/v1/disk_array.py b/code/daisyclient/daisyclient/v1/disk_array.py
index eaa9e1c5..a7dd8388 100755
--- a/code/daisyclient/daisyclient/v1/disk_array.py
+++ b/code/daisyclient/daisyclient/v1/disk_array.py
@@ -184,7 +184,7 @@ class DiskArrayManager(base.ManagerWithFind):
         url = '/v1/service_disk'
 
         hdrs = self._service_disk_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Disk_array(self, self._format_service_disk_meta_for_user(
             body['disk_meta']))
 
@@ -331,7 +331,7 @@ class DiskArrayManager(base.ManagerWithFind):
         url = '/v1/cinder_volume'
 
         hdrs = self._service_disk_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Disk_array(self, self._format_service_disk_meta_for_user(
             body['disk_meta']))
 
diff --git a/code/daisyclient/daisyclient/v1/hosts.py b/code/daisyclient/daisyclient/v1/hosts.py
index 6b0174ff..ff51a507 100755
--- a/code/daisyclient/daisyclient/v1/hosts.py
+++ b/code/daisyclient/daisyclient/v1/hosts.py
@@ -257,7 +257,7 @@ class HostManager(base.ManagerWithFind):
         hdrs = self._host_meta_to_headers(fields)
 
         resp, body = self.client.post('/v1/nodes',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
@@ -312,7 +312,7 @@ class HostManager(base.ManagerWithFind):
                 continue
         hdrs.update(self._host_meta_to_headers(fields))
         url = '/v1/discover_host/'
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
 
         return Host(self, self._format_host_meta_for_user(body))
 
@@ -335,7 +335,7 @@ class HostManager(base.ManagerWithFind):
         hdrs = self._host_meta_to_headers(fields)
 
         resp, body = self.client.post('/v1/discover/nodes',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
 
         return_request_id = kwargs.get('return_req_id', None)
diff --git a/code/daisyclient/daisyclient/v1/images.py b/code/daisyclient/daisyclient/v1/images.py
index 9016a57f..1ed4efd2 100755
--- a/code/daisyclient/daisyclient/v1/images.py
+++ b/code/daisyclient/daisyclient/v1/images.py
@@ -312,7 +312,7 @@ class ImageManager(base.ManagerWithFind):
             hdrs['x-glance-api-copy-from'] = copy_from
 
         resp, body = self.client.post('/v1/images',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=image_data)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
@@ -354,7 +354,7 @@ class ImageManager(base.ManagerWithFind):
             hdrs['x-glance-api-copy-from'] = copy_from
 
         url = '/v1/images/%s' % base.getid(image)
-        resp, body = self.client.put(url, headers=hdrs, data=image_data)
+        resp, body = self.client.put(url, headers=None, data=image_data)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
             return_request_id.append(resp.headers.get(OS_REQ_ID_HDR, None))
diff --git a/code/daisyclient/daisyclient/v1/install.py b/code/daisyclient/daisyclient/v1/install.py
index 9df6add5..db529813 100755
--- a/code/daisyclient/daisyclient/v1/install.py
+++ b/code/daisyclient/daisyclient/v1/install.py
@@ -90,7 +90,7 @@ class InstallManager(base.ManagerWithFind):
         url = '/v1/install'
 
         hdrs = self._install_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Install(self, self._format_install_meta_for_user(body))
 
     def export_db(self, **kwargs):
@@ -108,7 +108,7 @@ class InstallManager(base.ManagerWithFind):
 
         url = '/v1/export_db'
         hdrs = self._install_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Install(self, self._format_install_meta_for_user(body))
 
     def disk_array_update(self, cluster, **kwargs):
@@ -124,5 +124,5 @@ class InstallManager(base.ManagerWithFind):
 
         url = '/v1/disk_array/%s' % base.getid(cluster)
         hdrs = self._install_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Install(self, self._format_install_meta_for_user(body))
diff --git a/code/daisyclient/daisyclient/v1/networks.py b/code/daisyclient/daisyclient/v1/networks.py
index a453fabe..299f14fd 100755
--- a/code/daisyclient/daisyclient/v1/networks.py
+++ b/code/daisyclient/daisyclient/v1/networks.py
@@ -282,7 +282,7 @@ class NetworkManager(base.ManagerWithFind):
 
         hdrs = self._network_meta_to_headers(fields)
         resp, body = self.client.post('/v1/networks',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/roles.py b/code/daisyclient/daisyclient/v1/roles.py
index 53b51286..e9cb114e 100755
--- a/code/daisyclient/daisyclient/v1/roles.py
+++ b/code/daisyclient/daisyclient/v1/roles.py
@@ -280,7 +280,7 @@ class RoleManager(base.ManagerWithFind):
 
         hdrs = self._role_meta_to_headers(fields)
         resp, body = self.client.post('/v1/roles',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/services.py b/code/daisyclient/daisyclient/v1/services.py
index fb55dba3..649b0af5 100755
--- a/code/daisyclient/daisyclient/v1/services.py
+++ b/code/daisyclient/daisyclient/v1/services.py
@@ -275,7 +275,7 @@ class ServiceManager(base.ManagerWithFind):
 
         hdrs = self._service_meta_to_headers(fields)
         resp, body = self.client.post('/v1/services',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
diff --git a/code/daisyclient/daisyclient/v1/template.py b/code/daisyclient/daisyclient/v1/template.py
index e1457a64..7a89c7f2 100755
--- a/code/daisyclient/daisyclient/v1/template.py
+++ b/code/daisyclient/daisyclient/v1/template.py
@@ -221,7 +221,7 @@ class TemplateManager(base.ManagerWithFind):
         hdrs = self._template_meta_to_headers(fields)
 
         resp, body = self.client.post('/v1/template',
-                                      headers=hdrs,
+                                      headers=None,
                                       data=hdrs)
         return_request_id = kwargs.get('return_req_id', None)
         if return_request_id is not None:
@@ -275,7 +275,7 @@ class TemplateManager(base.ManagerWithFind):
 
         url = '/v1/export_db_to_json'
         hdrs = self._template_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Template(
             self, self._format_template_meta_for_user(body['template']))
 
@@ -293,7 +293,7 @@ class TemplateManager(base.ManagerWithFind):
 
         url = '/v1/import_json_to_template'
         hdrs = self._template_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Template(
             self, self._format_template_meta_for_user(body['template']))
 
@@ -311,7 +311,7 @@ class TemplateManager(base.ManagerWithFind):
 
         url = '/v1/import_template_to_db'
         hdrs = self._template_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Template(
             self, self._format_template_meta_for_user(body['template']))
 
@@ -327,7 +327,7 @@ class TemplateManager(base.ManagerWithFind):
 
         url = '/v1/host_to_template'
         hdrs = self._template_meta_to_headers(fields)
-        resp, body = self.client.post(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.post(url, headers=None, data=hdrs)
         return Template(
             self, self._format_template_meta_for_user(body['host_template']))
 
@@ -403,6 +403,6 @@ class TemplateManager(base.ManagerWithFind):
 
         url = '/v1/host_template'
         hdrs = self._template_meta_to_headers(fields)
-        resp, body = self.client.put(url, headers=hdrs, data=hdrs)
+        resp, body = self.client.put(url, headers=None, data=hdrs)
         return Template(
             self, self._format_template_meta_for_user(body['host_template']))
diff --git a/code/daisyclient/daisyclient/v1/uninstall.py b/code/daisyclient/daisyclient/v1/uninstall.py
index 935cbd9d..1ed66797 100755
--- a/code/daisyclient/daisyclient/v1/uninstall.py
+++ b/code/daisyclient/daisyclient/v1/uninstall.py
@@ -26,6 +26,7 @@ OS_REQ_ID_HDR = 'x-openstack-request-id'
 
 
 class Uninstall(base.Resource):
+
     def __repr__(self):
         return "<Uninstall %s>" % self._info
 
diff --git a/code/daisyclient/daisyclient/v1/update.py b/code/daisyclient/daisyclient/v1/update.py
old mode 100755
new mode 100644
index 3702ada5..89eb14e4
--- a/code/daisyclient/daisyclient/v1/update.py
+++ b/code/daisyclient/daisyclient/v1/update.py
@@ -75,7 +75,7 @@ class UpdateManager(base.ManagerWithFind):
             if field in CREATE_PARAMS:
                 fields[field] = kwargs[field]
             else:
-                msg = 'update() got an unexpected keyword argument \'%s\''
+                msg = 'update() got an unexpected argument \'%s\''
                 raise TypeError(msg % field)
 
             if "cluster" in fields:
diff --git a/code/daisyclient/setup.cfg b/code/daisyclient/setup.cfg
old mode 100755
new mode 100644
index cc48ef06..ec60e07c
--- a/code/daisyclient/setup.cfg
+++ b/code/daisyclient/setup.cfg
@@ -44,4 +44,3 @@ upload-dir = doc/build/html
 
 [wheel]
 universal = 1
-