Fix some larger clang issues