CLOUDIFY-2474 small pre review fixes