various changes to make clang not give warnings

2 jobs for master in 44 seconds
Status Job ID Name Coverage
  Test
passed #223901
x86_64 docker-alpine
test:alpine

00:00:34

passed #223902
x86_64 docker-alpine
test:debian

00:00:42