Add strict mode and furnace G2 changes