fixed types for heat and heat-cfn