Minor fixes as per code review.