CLOUD-216 small fixes