Buildfix and warningfix on gcc/clang.