Cloudify Bug Fixes