diff --git a/interface/ri_oper.py b/interface/ri_oper.py
index a0c49c8..e9e18c3 100644
--- a/interface/ri_oper.py
+++ b/interface/ri_oper.py
@@ -192,7 +192,6 @@ class ConfigureFstab(Mount):
def get_stdin(self):
fstab=''
- flag=True
for k in Mount.dict.keys():
if ri_data.MountPoint.dict[k] != 'swap':
fstab += "/dev/%s %s %s\n" %(k,Mount.dict[k],ri_data.MountPoint.dict[k].filesystem)
diff --git a/main/setup b/main/setup
index 3150d2f..ee95927 100755
--- a/main/setup
+++ b/main/setup
@@ -23,7 +23,7 @@
#===================================================================================
#Set variables
#===================================================================================
-workdir='/usr/lib/new_install/interface'
+workdir="$(pwd)/../interface"
exec_file='xinitrc_setup'
work_write_dir='/var/install'
#===================================================================================
diff --git a/xml/dependency.xml b/xml/dependency.xml
index 8cba0b6..8d23972 100644
--- a/xml/dependency.xml
+++ b/xml/dependency.xml
@@ -1656,6 +1656,7 @@
+