Furnace bugfixes