Linux/clang build fixes