Incorporate PR comments