diff --git a/gitso/trunk/Processes.py b/gitso/trunk/Processes.py
index 73134ee..494d2d6 100644
--- a/gitso/trunk/Processes.py
+++ b/gitso/trunk/Processes.py
@@ -38,11 +38,11 @@ class Processes:
 		elif sys.platform.find('linux') != -1:
 			self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)
 		elif sys.platform == 'win32':
-			self.returnPID = os.spawnl(os.P_NOWAIT, '%s\\WinVNC.exe' % os.environ['WINDIR'], '%s\\WinVNC.exe' % os.environ['WINDIR'])
+			self.returnPID = os.spawnl(os.P_NOWAIT, 'WinVNC.exe', 'WinVNC.exe')
 			print "Launched WinVNC.exe, waiting to run -connect command..."
 			import time
 			time.sleep(3)
-			self.returnPID = os.spawnl(os.P_NOWAIT, '%s\\WinVNC.exe' % os.environ['WINDIR'], '%s\\WinVNC.exe' % os.environ['WINDIR'], '-connect', '%s' % host)
+			self.returnPID = os.spawnl(os.P_NOWAIT, 'WinVNC.exe', 'WinVNC.exe', '-connect', '%s' % host)
 		else:
 			print 'Platform not detected'
 		return self.returnPID
@@ -55,7 +55,7 @@ class Processes:
 		elif sys.platform.find('linux') != -1:
 			self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-listen')                
 		elif sys.platform == 'win32':
-			self.returnPID = os.spawnl(os.P_NOWAIT, "%s\\vncviewer.exe" % os.environ['WINDIR'], '%s\\vncviewer.exe' % os.environ['WINDIR'], '-listen' )
+			self.returnPID = os.spawnl(os.P_NOWAIT, "vncviewer.exe" , 'vncviewer.exe' , '-listen' )
 		else:
 			print 'Platform not detected'
 		return self.returnPID
diff --git a/gitso/trunk/makegitso.nsi b/gitso/trunk/makegitso.nsi
index c0291b6..63ecd3a 100644
--- a/gitso/trunk/makegitso.nsi
+++ b/gitso/trunk/makegitso.nsi
@@ -86,8 +86,6 @@ Section "Gitso"
  ;start menu items
   CreateDirectory "$SMPROGRAMS\Gitso"
   CreateShortCut "$SMPROGRAMS\Gitso\Gitso.lnk" "$INSTDIR\Gitso.exe" "" "$INSTDIR\icon.ico" 0
-  
-  SetOutPath $WINDIR
   File ".\arch\win32\vncviewer.exe"
   File ".\arch\win32\WinVNC.exe"
   File ".\arch\win32\VNCHooks.dll"
@@ -113,9 +111,9 @@ Section "Uninstall"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gitso"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gitso"
   ; Remove files and uninstaller
-  Delete $WINDIR\vncviewer.exe
-  Delete $WINDIR\VNCHooks.dll
-  Delete $WINDIR\WinVNC.exe
+  Delete $INSTDIR\vncviewer.exe
+  Delete $INSTDIR\VNCHooks.dll
+  Delete $INSTDIR\WinVNC.exe
   ; Remove shortcuts and folder
   RMDir /r "$SMPROGRAMS\Gitso"
   RMDir /r $INSTDIR