Misc changes for clang.
Fix legit warnings.