More Visual C++ compat