Some minor CR by Mark