diff --git a/lib/puppet-standalone-mashup/capistrano.rb b/lib/puppet-standalone-mashup/capistrano.rb
index 34921a5..76c7407 100644
--- a/lib/puppet-standalone-mashup/capistrano.rb
+++ b/lib/puppet-standalone-mashup/capistrano.rb
@@ -47,10 +47,15 @@ Capistrano::Configuration.instance.load do
   desc "Apply the configuration"
   task :apply do
     top.copy_files
+    top.rename if rename_server && wrong_server_name?
 
     run "cd #{puppet_dir} && #{sudo} ./apply"
   end
 
+  def wrong_server_name?
+    capture("hostname").strip
+  end
+
   desc "Bootstrap the server"
   task :bootstrap do
     top.copy_files
diff --git a/shared/additional-modules/debian-base/manifests/init.pp b/shared/additional-modules/debian-base/manifests/init.pp
index 5903312..2d7a6e2 100644
--- a/shared/additional-modules/debian-base/manifests/init.pp
+++ b/shared/additional-modules/debian-base/manifests/init.pp
@@ -14,6 +14,7 @@ class base {
   $log_path = "/var/log"
   $local_path = $install_path
   $share_path = "/usr/local/share"
+  $data_path = "/var/data"
 }
 
 node default {
@@ -21,7 +22,5 @@ node default {
   include debian
 
   class { base: require => Class['basics'] }
-
-  include umask
 }
 
diff --git a/shared/additional-modules/god/templates/god-init.d-base b/shared/additional-modules/god/templates/god-init.d
similarity index 100%
rename from shared/additional-modules/god/templates/god-init.d-base
rename to shared/additional-modules/god/templates/god-init.d
diff --git a/shared/additional-modules/varnish/manifests/init.pp b/shared/additional-modules/varnish/manifests/init.pp
index 541764c..4ce49de 100644
--- a/shared/additional-modules/varnish/manifests/init.pp
+++ b/shared/additional-modules/varnish/manifests/init.pp
@@ -33,11 +33,6 @@ class varnish($version, $store_file_mb = 1024) {
     require => Build_and_install[$name]
   }
 
-  file { $varnish::vcl_path:
-    content => template('varnish-redhat/default.vcl'),
-    require => [ Mkdir_p[$config] ]
-  }
-
   file { $override_config:
     ensure => present,
     mode => 644,
diff --git a/shared/lib/puppet/provider/configure/action.rb b/shared/lib/puppet/provider/configure/action.rb
index 3b6b515..ec25a7b 100644
--- a/shared/lib/puppet/provider/configure/action.rb
+++ b/shared/lib/puppet/provider/configure/action.rb
@@ -3,6 +3,7 @@ Puppet::Type.type(:configure).provide(:action) do
 
   def create
     system %{bash -c '#{path} cd #{@resource[:build_path]} ; #{@resource[:preconfigure]} ./configure --prefix=#{@resource[:install_path]} #{@resource[:options]}'}.tap { |o| p o }
+    raise StandardError.new("Could not configure") if $?.exitstatus != 0
   end
 
   def destroy
@@ -21,9 +22,10 @@ Puppet::Type.type(:configure).provide(:action) do
   end
 
   def unless?
-    return nil if @resource[:unless].empty?
+    return nil if !@resource[:unless] || @resource[:unless].empty?
 
     system %{bash -c '#{@resource[:unless]}'}
+
     $?.exitstatus == 0
   end
 
diff --git a/shared/lib/puppet/provider/download_and_unpack/action.rb b/shared/lib/puppet/provider/download_and_unpack/action.rb
index 5a1af54..4785a4e 100644
--- a/shared/lib/puppet/provider/download_and_unpack/action.rb
+++ b/shared/lib/puppet/provider/download_and_unpack/action.rb
@@ -22,7 +22,7 @@ Puppet::Type.type(:download_and_unpack).provide(:action) do
 
   private
   def unless?
-    return nil if @resource[:unless].empty?
+    return nil if !@resource[:unless] || @resource[:unless].empty?
 
     system %{bash -c '#{@resource[:unless]}'}
 
diff --git a/shared/lib/puppet/provider/make_and_install/action.rb b/shared/lib/puppet/provider/make_and_install/action.rb
index 4e01459..f871b20 100644
--- a/shared/lib/puppet/provider/make_and_install/action.rb
+++ b/shared/lib/puppet/provider/make_and_install/action.rb
@@ -5,6 +5,7 @@ Puppet::Type.type(:make_and_install).provide(:action) do
 
   def create
     system %{bash -c '#{path} cd #{@resource[:build_path]} ; make && make install'}
+    raise StandardError.new("Could not make and install") if $?.exitstatus != 0
 
     FileUtils.rm_rf symlink_path
     FileUtils.ln_sf(@resource[:install_path], symlink_path)
@@ -23,9 +24,10 @@ Puppet::Type.type(:make_and_install).provide(:action) do
 
   private
   def unless?
-    return nil if @resource[:unless].empty?
+    return nil if !@resource[:unless] || @resource[:unless].empty?
 
     system %{bash -c '#{@resource[:unless]}'}
+
     $?.exitstatus == 0
   end
 
diff --git a/skel/debian/bootstrap.erb b/skel/debian/bootstrap.erb
index 1125a61..297725c 100644
--- a/skel/debian/bootstrap.erb
+++ b/skel/debian/bootstrap.erb
@@ -8,6 +8,8 @@ fi
 export DEBIAN_FRONTEND=noninteractive
 export PAGER=cat
 
+echo "deb http://backports.debian.org/debian-backports squeeze-backports main" > /etc/apt/sources.list.d/debian-backports.list
+
 apt-get --force-yes update
 apt-get --force-yes -y remove x11-common xserver-xorg-video-all xserver-xorg-core xserver-xorg-video-radeon libgl1-mesa-dri mutt libdrm-intel1 libdrm-radeon1
 apt-get --force-yes -y install deborphan