diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php
index 5a87d91..7d1fdaa 100644
--- a/setup/wizard/lib/services/windowsLucene.php
+++ b/setup/wizard/lib/services/windowsLucene.php
@@ -421,23 +421,15 @@ class windowsLucene extends windowsService {
  	*/
 	public function install() {
 		$state = $this->status();
-//		if($state == '') {
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
-//			if($luceneExe && $luceneSource && $luceneDir) {
-				$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()." -description "."\"".$this->description."\""."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
-            	if(DEBUG) {
-            		echo "$cmd<br/>";
-            		return false;
-            	}
-            	$this->writeLuceneInstall($cmd);
-				//$response = $this->util->pexec($cmd);
-//				return $response;
-//			}
-			return $state;
-//		}
-
+			$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" -description "."\"".$this->description."\""." \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
+        	if(DEBUG) {
+        		echo "$cmd<br/>";
+        		return false;
+        	}
+        	$this->writeLuceneInstall($cmd);
 		return $state;
 	}
 
diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php
index 50f96db..8ac99ac 100644
--- a/setup/wizard/lib/services/windowsOpenOffice.php
+++ b/setup/wizard/lib/services/windowsOpenOffice.php
@@ -214,7 +214,7 @@ class windowsOpenOffice extends windowsService {
     	if($status == '') {
     		$binary = $this->getBin();
     		if($binary != '') {
-            	$cmd = "\"{$this->winservice}\" install {$this->name} -description {$this->description} -displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
+            	$cmd = "\"{$this->winservice}\" install \"{$this->name}\" -description \"{$this->description}\" -displayname \"{$this->name}\" -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
 	        	if(DEBUG) {
 	        		echo "$cmd<br/>";
 	        		return false;
diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php
index e311444..c4d4899 100644
--- a/setup/wizard/lib/services/windowsScheduler.php
+++ b/setup/wizard/lib/services/windowsScheduler.php
@@ -182,7 +182,7 @@ class windowsScheduler extends windowsService {
 	}
 	
 	private function setOptions() {
-		$this->options = "-displayname {$this->name} -description {$this->description} -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
+		$this->options = "-displayname \"{$this->name}\" -description \"{$this->description}\" -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
 	}
 	
 	private function writeTaskRunner() {
@@ -235,36 +235,9 @@ class windowsScheduler extends windowsService {
 		$state = $this->status();
 		if($state == '') {
 			$this->writeTaskRunner();
-            //if (function_exists('win32_create_service')) { // TODO what if it does not exist? check how the dmsctl.bat does this
-//            	if(DEBUG) {
-//            		echo '<pre>';
-//            		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
-//    	            echo '</pre>';
-//    	            echo '<pre>';
-//    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
-//    	            echo '</pre>';
-//            		return ;
-//            	}
-            	/*
-    			$response = win32_create_service(array(
-    	            'service' => $this->name,
-    	            'display' => $this->name,
-    	            'path' => $this->getSchedulerScriptPath()
-    	            ));
-    			return $response;
-    			*/
-            //} else { // Attempt to use the winserv
-            	// TODO: Add service using winserv
-            	$this->setWinservice();
-            	$this->setOptions();
-            	$cmd = "\"{$this->winservice}\" install $this->name $this->options";
-            	if(DEBUG) {
-            		echo "$cmd<br/>";
-            		return false;
-            	}
-            	//$response = $this->util->pexec($cmd);
-            	//return $response;
-            //}
+        	$this->setWinservice();
+        	$this->setOptions();
+        	$cmd = "\"{$this->winservice}\" install $this->name $this->options";
             $this->writeSchedulerInstall($cmd);
 		}
 		return $state;
@@ -287,7 +260,7 @@ class windowsScheduler extends windowsService {
 	}
 	
 	public function getStopMsg($installDir) {
-		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
+		return "";
 	}
 }
 ?>
\ No newline at end of file