Upstart fixes