CLOUD-216 gcc fixed messages