A few fixes for clang support