Fixed some service stop/start bugs.