(fix) Minor changes based on reviews.