Small fixes detected after changing to clang++ compiler.