MSVC 7.1 build fixes