CLOUDIFY-2449 small bug fixes