A few fixes to get Upstart working (testing on Vagrant)