Fix codes pointed in review.