Update fixes for GCP-5667