Fix recent clang changes in VS