Fixes from pull request review.