Fixed issues on the service.