Fix related to PR comments