fix minor issues from PR comments