Address comments: gcloud.