fixes for gcloud specific build