diff --git a/lib/cdist/config.py b/lib/cdist/config.py
index 942d2917..c5f4b4ef 100644
--- a/lib/cdist/config.py
+++ b/lib/cdist/config.py
@@ -42,7 +42,7 @@ def config(args):
     os.environ['__remote_copy'] = "scp -o User=root -q"
 
     for host in args.host:
-        c = Config(host, initial_manifest=args.manifest, home=args.cdist_home, debug=args.debug)
+        c = Config(host, initial_manifest=args.manifest, base_dir=args.cdist_home, debug=args.debug)
         if args.parallel:
             log.debug("Creating child process for %s", host)
             process[host] = multiprocessing.Process(target=c.deploy_and_cleanup)
diff --git a/lib/cdist/config_install.py b/lib/cdist/config_install.py
index d77f6d7b..a8ea9043 100644
--- a/lib/cdist/config_install.py
+++ b/lib/cdist/config_install.py
@@ -25,10 +25,9 @@ import os
 import stat
 import sys
 
-import cdist.emulator
-import cdist.path
-
+import cdist.context
 import cdist.core
+import cdist.emulator
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/cdist/emulator.py b/lib/cdist/emulator.py
index 77f26e7f..aa22e1fa 100644
--- a/lib/cdist/emulator.py
+++ b/lib/cdist/emulator.py
@@ -24,7 +24,6 @@ import logging
 import os
 
 import cdist
-import cdist.path
 
 log = logging.getLogger(__name__)