diff --git a/lib/cdist/exec/local.py b/lib/cdist/exec/local.py
index 8c9ef209..e510a8fb 100644
--- a/lib/cdist/exec/local.py
+++ b/lib/cdist/exec/local.py
@@ -61,7 +61,7 @@ class Local(object):
         self.log = logging.getLogger(self.target_host)
 
         # Setup file permissions using umask
-        os.umask(0o700)
+        os.umask(0o077)
 
     def create_directories(self):
         self.mkdir(self.out_path)
diff --git a/lib/cdist/exec/remote.py b/lib/cdist/exec/remote.py
index 173d1984..fb90939d 100644
--- a/lib/cdist/exec/remote.py
+++ b/lib/cdist/exec/remote.py
@@ -108,6 +108,7 @@ class Remote(object):
         # Always call umask before actual call to ensure proper file permissions
         cmd.append("umask 077;")
 
+        # FIXME: replace this by -o SendEnv name -o SendEnv name ... to ssh?
         # can't pass environment to remote side, so prepend command with
         # variable declarations
         if env: