Merge branch '2021-06-22-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Wed, 23 Jun 2021 12:45:09 +0000 (08:45 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 23 Jun 2021 12:45:09 +0000 (08:45 -0400)
- Assorted minor bugfixes


Trivial merge