Fix according to PR comments