Minor changes from CR-WTC-6 review.