More fixes for older MSVC, support for Windows 7 SDK