More updating to v1.8.