GCP-7633 addtl fixes