Merge branch 'fix-warnings' into 'master'

Fix some assorted compiler warnings

See merge request !252
5 jobs for master in 5 minutes and 2 seconds (queued for 7 seconds)
Status Name Job ID Coverage
  Build
passed build-centos7 #17145080

00:04:30

passed build-centos7-view97 #17145081

00:05:02

passed build-fedora32 #17145083

00:03:29

passed build-fedora33 #17145084

00:03:02

passed build-ubuntu #17145082

00:03:37