diff --git a/lib/puppet-standalone-mashup/capistrano.rb b/lib/puppet-standalone-mashup/capistrano.rb
index ff2a9a2..9ecc7d5 100644
--- a/lib/puppet-standalone-mashup/capistrano.rb
+++ b/lib/puppet-standalone-mashup/capistrano.rb
@@ -33,6 +33,7 @@ Capistrano::Configuration.instance.load do
 
   _cset(:rename_server) { true }
   _cset(:use_sudo) { true }
+  _cset(:run_as_user) { false }
   _cset(:additional_modules) { [] }
   _cset(:additional_puppet_options) { '' }
 
@@ -61,7 +62,11 @@ Capistrano::Configuration.instance.load do
 
   def as_user(cmd)
     if use_sudo
-      %{#{sudo} su -c "#{cmd}" #{user}}
+      if run_as_user
+        %{#{sudo} su -c "#{cmd}" #{user}}
+      else
+        %{#{sudo} #{cmd}}
+      end
     else
       cmd
     end
diff --git a/lib/puppet-standalone-mashup/capistrano/vagrant.rb b/lib/puppet-standalone-mashup/capistrano/vagrant.rb
index 54cc951..5ce5191 100644
--- a/lib/puppet-standalone-mashup/capistrano/vagrant.rb
+++ b/lib/puppet-standalone-mashup/capistrano/vagrant.rb
@@ -6,6 +6,7 @@ Capistrano::Configuration.instance.load do
   set(:user) { 'vagrant' }
   set(:password) { 'vagrant' }
   set(:use_sudo) { true }
+  set(:run_as_user) { false }
 
   task :ensure_puppet do
     require 'socket'
diff --git a/shared/additional-modules/squid/manifests/init.pp b/shared/additional-modules/squid/manifests/init.pp
index 8a46ca3..3c6b16f 100644
--- a/shared/additional-modules/squid/manifests/init.pp
+++ b/shared/additional-modules/squid/manifests/init.pp
@@ -67,6 +67,7 @@ class squid($version = '', $user = 'proxy', $group = 'proxy', $config_template,
     command => "${sbin}/squid3 -z",
     logoutput => true,
     require => Exec[cache_dir_perms, log_dir_params],
+    unless => "test -d ${cache_dir}/00",
     path => $::base::path
   }
 
diff --git a/shared/modules/remotedeb/manifests/init.pp b/shared/modules/remotedeb/manifests/init.pp
index ba5b220..270ec45 100644
--- a/shared/modules/remotedeb/manifests/init.pp
+++ b/shared/modules/remotedeb/manifests/init.pp
@@ -3,7 +3,7 @@ define remotedeb($url, $version) {
 
   exec { "remotedeb-${name}":
     command => "curl -o ${deb} ${url} && dpkg -i ${deb}",
-    unless => "test $(dpkg -l ${name} | grep ${version} | wc -l) -ne 0",
+    unless => "test $(dpkg -l ${name} | grep ${version} | wc -l) -eq 0",
     path => $base::path
   }
 }