Merge "Fix 2 new sets of clang compiler warnings."