Small Visual C++ fixes.