Fix some compiler warnings
These changes match the changes to the master branch in commit de11c043.
(I assume these should not be merged before the 21.04 release next week.)
These changes match the changes to the master branch in commit de11c043.
(I assume these should not be merged before the 21.04 release next week.)