More fixes for Icehouse
Finish up dev of heat work