CLOUDIFY-2644 minor fixes