More fixes for clang