diff --git a/__init__.py b/__init__.py
index e77ec4d..d4692a9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -54,7 +54,7 @@ def run(group, arglist):
 
         arg_is = {
            'action': lambda arg: hasattr(serv, 'do_' + arg),
-           'ins': lambda arg: arg in serv.info or arg == 'all' or serv.wildcard(arg),
+           'ins': lambda arg: arg in serv.info or arg in ('all', 'check') or serv.wildcard(arg),
            'service': lambda arg: arg in serv.services,
         }
 
diff --git a/nicosman.py b/nicosman.py
index 00e4e57..57b44c3 100644
--- a/nicosman.py
+++ b/nicosman.py
@@ -96,13 +96,13 @@ class NicosManager(ServiceManager):
         self.get_info()
         for ins_i in ins_list:
             env = self.env[ins_i]
-            base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins)
+            base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins_i)
             nicos_conf = join(base, 'nicos.conf')
             content = {
                 'nicos': {
-                    'setup_subdirs': '["%s", "common", "frappy_sinq"]' % ins,
-                    'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins),
-                    'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins),
+                    'setup_subdirs': '["%s", "linse_nicos", "frappy_sinq"]' % ins_i,
+                    'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
+                    'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
                 },
                 # 'environment': {
                 #     key: f'"{env[key]}"' for key in env if key in ENV_KEYS