CLOUDIFY-1722 Fix build errors