Fix service restarts