Merge branch '2021-08-04-assorted-minor-fixes'
authorTom Rini <trini@konsulko.com>
Thu, 5 Aug 2021 01:18:33 +0000 (21:18 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 5 Aug 2021 01:18:33 +0000 (21:18 -0400)
- Assorted fixes


Trivial merge