More ceilo/heat task fixes.