Fix issues from PR comments