Upstart changes