Fix warning & blind clang build fix