Some more build warnings fixes

Hi,

here are some more fixes for build warnings that add some noise to the build logs.

Something that went under the radar for !1160 (merged)

Thank you, Antonio