More furnace fixes