Fix service start/stop