Fix additional clang finds.