Corrected errors from Code Review.