Fixes in response to PR review.