MSVC 2003 build compiles again