updates to support upstart