Fix try to fix the build with gcc. clang is happy with the changes too.