CLOUD-67 fixed issues