Minor changes to address PR comments.