CLOUDIFY-2449 small fixes