minor fixes for GCP-6230