Improve Visual C++ compat