Clang build fix

I experienced some build problems after recent changes