Applied fixes from remarks and reviews.