Minor fixes from pull review.