Minor fixes per code review.