CLOUDIFY-2511 small fixes