Merge pull request #859 from TheBlueMatt/2021-03-fix-warns