Fix start/stop service...