Fixed issues from PR comments