Addressing PR issues per comments