More fixes for upstart handling.