Merge branch 'fix-warnings' into 'master'

Fix compiler warnings

See merge request !253
5 jobs for master in 5 minutes and 29 seconds (queued for 5 seconds)