Some changes from warnings/errors from clang++ compiler.