Fixes per code review.