Minor changes based on PR comments.