Fixes according to the reviews.