Finish support for updated gcloud