diff --git a/modules/rcbau/files/zuul/layout.yaml b/modules/rcbau/files/zuul/layout.yaml
index bc2c92c..c22fa6e 100644
--- a/modules/rcbau/files/zuul/layout.yaml
+++ b/modules/rcbau/files/zuul/layout.yaml
@@ -52,7 +52,7 @@ pipelines:
         to: "joshua.hesketh@gmail.com, michael.still@rackspace.com"
     success-message: "Experimental database migration testing successful."
     failure-message: "Experimental database migration testing failed either due to migrations unable to be applied correctly or taking too long."
-    footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/Nova/Turbo-Hipster"
+    footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/ThirdPartySystems/DB_Datasets_CI"
 
   - name: silent
     manager: IndependentPipelineManager
@@ -72,7 +72,7 @@ pipelines:
         to: "michael.still@rackspace.com"
     success-message: "Silent test passed"
     failure-message: "Silent test failed"
-    footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/Nova/Turbo-Hipster"
+    footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/ThirdPartySystems/DB_Datasets_CI"
 
 jobs:
   - name: ^real-db-upgrade_.*$
diff --git a/modules/turbo_hipster/manifests/init.pp b/modules/turbo_hipster/manifests/init.pp
index c6ecd47..b0d5cb3 100644
--- a/modules/turbo_hipster/manifests/init.pp
+++ b/modules/turbo_hipster/manifests/init.pp
@@ -229,15 +229,12 @@
     require => File['/etc/turbo-hipster/start_TH_service.sh'],
   }
 
-  package { 'virtualenvwrapper':
-    ensure => present,
-  }
-
   # FIXME: This is a horrible hack to get a version of virtualenv >= 1.11
   # This will run every time but since it's only ran once on slaves it'll do
   # until we fix the versioning properly
-  exec { 'update virtualenv':
-    command   => "pip install -U virtualenv pip",
+  exec { 'update-virtualenv':
+    command   => "pip install -U setuptools virtualenv pip virtualenvwrapper",
+    path      => '/usr/local/bin:/usr/bin:/bin/',
     require   => Class['pip'],
   }
 
diff --git a/modules/turbo_hipster/templates/init_turbo-hipster.erb b/modules/turbo_hipster/templates/init_turbo-hipster.erb
index c58581e..51f56eb 100644
--- a/modules/turbo_hipster/templates/init_turbo-hipster.erb
+++ b/modules/turbo_hipster/templates/init_turbo-hipster.erb
@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides: turbo-hipster-worker-server
-# Required-Start: $remote_fs $syslog
+# Required-Start: $remote_fs $syslog mountnfs
 # Required-Stop: $remote_fs $syslog
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
@@ -12,7 +12,7 @@
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin
 DESC="turbo-hipster CI Worker Server"
 NAME=turbo-hipster-worker-server
 DAEMON=/usr/local/bin/turbo-hipster