Fix upstart behaviour

This seems to fix restart issues