Yet another attempt at fixing service start/stop issues.