Minor reworks.