diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index 06127660..6c285204 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -297,7 +297,8 @@ class Local(object):
                                             self.cache_path_pattern)
         self.log.debug("cache subpath: {}".format(cache_subpath))
         destination = os.path.join(self.cache_path, cache_subpath)
-        self.log.debug("Saving " + self.base_path + " to " + destination)
+        self.log.trace(("Saving cache: " + self.base_path + " to " +
+                        destination))
 
         if not os.path.exists(destination):
             shutil.move(self.base_path, destination)
diff --git a/cdist/util/ipaddr.py b/cdist/util/ipaddr.py
index b9d1ab30..0bcb0a83 100644
--- a/cdist/util/ipaddr.py
+++ b/cdist/util/ipaddr.py
@@ -46,7 +46,7 @@ def resolve_target_host_name(host):
             host, host_name))
     except (socket.gaierror, socket.herror) as e:
         log.warning("Could not derive host_name for {}"
-                 ", $host_name will be empty. Error is: {}".format(host, e))
+                    ", $host_name will be empty. Error is: {}".format(host, e))
         # in case of error provide empty value
         host_name = ''
     return host_name
@@ -60,7 +60,7 @@ def resolve_target_fqdn(host):
             host, host_fqdn))
     except socket.herror as e:
         log.warning("Could not derive host_fqdn for {}"
-                 ", $host_fqdn will be empty. Error is: {}".format(host, e))
+                    ", $host_fqdn will be empty. Error is: {}".format(host, e))
         # in case of error provide empty value
         host_fqdn = ''
     return host_fqdn