Minor fixes in GCP