Backport my fixes to 23.08

Joshua Goins requested to merge work/redstrate/more-backports into release/23.08 Aug 16, 2023