diff --git a/expetator/experiment.py b/expetator/experiment.py
index 8553d86a2f83413664687469134dc7d31d1c80e8..b49e0ee968244502252d5102c8cc4e4d9fafc384 100755
--- a/expetator/experiment.py
+++ b/expetator/experiment.py
@@ -16,11 +16,11 @@ from execo import Process
 class Executor:
     'Allow access to the platform'
     def __init__(self):
-        self.tmp_dir
+        self.tmp_dir = ''
         if os.path.isdir('/dev/shm'):
-            self.tmp_dir = tempfile.mkdtemp(prefix="/dev/shm")
+            self.tmp_dir = tempfile.mkdtemp(prefix="/dev/shm/")
         else:
-            self.tmp_dir = tempfile.mkdtemp(prefix="/tmp/executor")
+            self.tmp_dir = tempfile.mkdtemp(prefix="/tmp/executor/")
         self.mpi_host_file = '%s/mpi_host_file' % self.tmp_dir
         self.mpi_core_file = '%s/mpi_core_file' % self.tmp_dir
         self.mpi_options = ''
diff --git a/expetator/monitors/mojitos.py b/expetator/monitors/mojitos.py
index e40cd74a8a27149c2d81b6e84d91de2a4b752e32..a47b6ca09a7456702cd3e6bf7c32faf7d5064d9d 100644
--- a/expetator/monitors/mojitos.py
+++ b/expetator/monitors/mojitos.py
@@ -94,7 +94,7 @@ class Mojitos:
             self.cmdline += ' -r'
         if self.load:
             self.cmdline += ' -u'
-        self.monitoring_file = '%s/monitoring_moj' executor.tmp_dir
+        self.monitoring_file = '%s/monitoring_moj' % executor.tmp_dir
         self.cmdline += ' -o %s &' % self.monitoring_file
 
 
diff --git a/setup.py b/setup.py
index 29e6aaea3e4ab31c5721a6bbd9a2b7187a97e8c7..59daa6c73bfcd31a09167bc37dbb86ee4ce624d6 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="expetator",
-    version="0.3.20",
+    version="0.3.22",
     author="Georges Da Costa",
     author_email="georges.da-costa@irit.fr",
     description="A framework for monitoring HPC applications using DVFS",