Fixes for pull request review.