Improves Clang support