Minor comments
Service updates