Fixes from PR review.