(fix) Various changes based on review.