MSVC 2003 compiles again