Fixed issues with services not stopping