Address 2 review comments

Wika, Steve (Contractor) requested to merge sw_fixes into main May 13, 2022