Update: restored clang build with a little hack