More fixes to build under Clang