Fixed more PR comments.