diff --git a/tools/chocolateyinstall.ps1 b/tools/chocolateyinstall.ps1
index 9980dab..0f983f0 100644
--- a/tools/chocolateyinstall.ps1
+++ b/tools/chocolateyinstall.ps1
@@ -13,7 +13,7 @@ $local = $false
 # Wait for timer job during deploy and retract
 function Wait4TimerJob($solution)
 {
-  $counter = 120
+  $counter = 240
   $sleeptime = 1
 
   while( ($solution.JobExists -eq $true ) -and ( $counter -gt 0 ) )
diff --git a/tools/chocolateyuninstall.ps1 b/tools/chocolateyuninstall.ps1
index 2bd4911..74128e4 100644
--- a/tools/chocolateyuninstall.ps1
+++ b/tools/chocolateyuninstall.ps1
@@ -13,6 +13,10 @@ if ($sol -ne $null)
     #Uninstall-SPSolution $sol -AllWebApplications -Local
     #$sol.LastOperationDetails | Write-Host -ForegroundColor Yellow
     #Remove-SPSolution $sol
-}
 
-"You have to manually uninstall the solution: " + $file.Name | Write-Host -ForegroundColor Yellow
+    "You have to manually uninstall the solution: " + $file.Name | Write-Host -ForegroundColor Yellow
+}
+else
+{
+    "Solution already uninstalled" | Write-Host -ForegroundColor Green
+}