Fixed more issues from review.