More fixes for clang compiler and analyzer warnings.