Merge pull request #1448 from TheBlueMatt/2022-04-fix-warnings