Upstart improvements

Small upstart scripts improvements