Fix issues brought up by team in code review.