CLOUDIFY-1762 fix compilation problems