Added support for heat, mostly when targeting havana where isn't a default.