Fix compilation errors with clang

6 jobs for master