Minor issues with shutdown service.