Fix based on PR comments