CLOUDIFY-2201 minor fixes