Fix problems exposed by trying against heat-api-cfn.