CLOUD-103 fixed issues