CLOUDIFY-2222 small fixes