Small fixes from Ric's code review.