diff --git a/cdist/config.py b/cdist/config.py
index b1a120ca..6b57e7bf 100644
--- a/cdist/config.py
+++ b/cdist/config.py
@@ -200,7 +200,8 @@ class Config(object):
         log = logging.getLogger(host)
 
         try:
-            remote_exec, remote_copy = cls._resolve_remote_cmds(host_base_path)
+            remote_exec, remote_copy = cls._resolve_remote_cmds(
+                args, host_base_path)
             log.debug("remote_exec for host \"{}\": {}".format(
                 host, remote_exec))
             log.debug("remote_copy for host \"{}\": {}".format(
diff --git a/cdist/hostsource.py b/cdist/hostsource.py
index 8170536c..9c2c0616 100644
--- a/cdist/hostsource.py
+++ b/cdist/hostsource.py
@@ -60,7 +60,7 @@ class HostSource(object):
                 yield host
 
     def hosts(self):
-        if not source:
+        if not self.source:
             return
 
         if isinstance(self.source, str):