Changes from previous PR comments