GCP-6230, bug fixes