Some rudimentary changes for service restarts