build: fixes for clang build problems.