MSVC 2003 build works again