Merge pull request #821 from jkczyz/2021-03-fix-build-warnings